From 98d6d281cedeee24b633b6f23788f794451d85fc Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 24 May 2023 16:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=93=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/scmwarehouse/AppScmWarehouseVo.java | 2 ++ .../anrui/scm/api/scmwarehouse/ScmExtra.java | 15 +++++++++++ .../anrui/scm/api/scmwarehouse/ScmWarVo.java | 16 ++++++++++++ .../api/scmwarehouse/ScmWarehouseFeign.java | 4 +++ .../ScmWarehouseFeignFallback.java | 5 ++++ .../biz/scmwarehouse/ScmWarehouseMapper.java | 9 ++++--- .../biz/scmwarehouse/ScmWarehouseMapper.xml | 11 ++++++++ .../biz/scmwarehouse/ScmWarehouseRest.java | 5 ++++ .../biz/scmwarehouse/ScmWarehouseService.java | 25 +++++++++++++++++-- 9 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java index b036d5dabc..26837eecea 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java @@ -13,4 +13,6 @@ public class AppScmWarehouseVo implements Vo { private String dictKey; @ApiModelProperty("仓库value") private String dictValue; + + private } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java new file mode 100644 index 0000000000..46ad7a25c6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.scm.api.scmwarehouse; + +import lombok.Data; + +/** + * @description: 说明 + * @author: dimengzhe + * @date: 2023/5/24 + **/ +@Data +public class ScmExtra { + + private String name; + private String sid; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java new file mode 100644 index 0000000000..2552d4444a --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.scm.api.scmwarehouse; + +import lombok.Data; + +/** + * @description: 仓库相关 + * @author: dimengzhe + * @date: 2023/5/24 + **/ +@Data +public class ScmWarVo { + + private String id; + private String dictValue; + private ScmExtra extra; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java index d253fd3539..40601172f2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java @@ -73,6 +73,10 @@ public interface ScmWarehouseFeign { @GetMapping(value = "/selectWarehouseByUserSid") public ResultBean> selectWarehouseByUserSid(@SpringQueryMap AppScmWarehouseQuery appScmWarehouseQuery); + @ApiOperation("手机端-获取仓库新") + @GetMapping(value = "/selectWarehouseByUserSidOne") + public ResultBean> selectWarehouseByUserSidOne(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam(value = "search",required = false) String search); + @ApiOperation("巡检获取仓库管理人") @GetMapping("/selectByAddressSid/{addressSid}") public ResultBean selectByAddressSid(@PathVariable("addressSid") String addressSid); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java index ea59ee018c..ac49e62da3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java @@ -79,6 +79,11 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign { return null; } + @Override + public ResultBean> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) { + return null; + } + @Override public ResultBean selectByAddressSid(String addressSid) { return null; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java index 479c371aa5..37a9bb4654 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java @@ -26,16 +26,16 @@ package com.yxt.anrui.scm.biz.scmwarehouse; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmwarehouse.AppScmWarehouseVo; -import com.yxt.common.core.result.ResultBean; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import java.util.List; import java.util.Map; @@ -69,6 +69,7 @@ public interface ScmWarehouseMapper extends BaseMapper { List> fetchByUseOrgSid(String sid); List selectWarehouseByUserSid(@Param("useOrgSid") String useOrgSid); + List selectWarehouseByUserSidOne(@Param("useOrgSid") String useOrgSid,@Param("search") String search); @Select("select * from scm_warehouse where sid =#{addressSid}") ScmWarehouseVo selectByAddressSid(@Param("addressSid") String addressSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml index cf1fea6748..f4818aecb8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml @@ -27,4 +27,15 @@ FROM scm_warehouse WHERE useOrgSid = #{useOrgSid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java index 1a51ca3190..889b9ff263 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java @@ -117,6 +117,11 @@ public class ScmWarehouseRest implements ScmWarehouseFeign { return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery); } + @Override + public ResultBean> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) { + return scmWarehouseService.selectWarehouseByUserSidOne(userSid,orgPath,search); + } + @Override public ResultBean selectByAddressSid(String addressSid) { return scmWarehouseService.selectByAddressSid(addressSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index c1a4947527..5a9cc1e5b2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -7,7 +7,6 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; -import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -22,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -203,4 +202,26 @@ public class ScmWarehouseService extends MybatisBaseService> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) { + ResultBean> rb = ResultBean.fireFail(); + if (StringUtils.isBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } else { + orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } + List list = baseMapper.selectWarehouseByUserSidOne(orgPath,search); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (int i = 0; i < list.size(); i++) { + ScmWarVo scmWarVo = list.get(i); + ScmExtra scmExtra = new ScmExtra(); + scmExtra.setSid(scmWarVo.getId()); + scmExtra.setName(scmWarVo.getDictValue()); + scmWarVo.setExtra(scmExtra); + } + } + + return rb.success().setData(list); + } } \ No newline at end of file