From 918e36482e041fb1de8611b251f9f7ab8fe8ecdb Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 17 May 2024 16:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/base/BaseGoodsBrandRest.java | 7 +++--- .../base/apiadmin/base/BaseGoodsTypeRest.java | 7 +++--- .../base/apiadmin/base/BaseGoodsUnitRest.java | 7 +++--- .../apiadmin/base/BaseManufacturerRest.java | 7 +++--- .../basebrandinfo/BaseBrandInfoService.java | 19 ++++++++++++++-- .../basegoodstype/BaseGoodsTypeService.java | 21 ++++++++++++++++-- .../basegoodsunit/BaseGoodsUnitService.java | 22 +++++++++++++++++-- .../BaseManufacturerService.java | 21 ++++++++++++++++-- .../java/com/yxt/base/utils/OrgPathQuery.java | 13 +++++++++++ .../WmsWarehouseAreaMapper.java | 2 +- .../WmsWarehouseAreaService.java | 1 + 11 files changed, 106 insertions(+), 21 deletions(-) create mode 100644 yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java index 3738b7c2d3..0635d1b9af 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java @@ -1,6 +1,7 @@ package com.yxt.base.apiadmin.base; import com.yxt.base.biz.base.basebrandinfo.*; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -29,9 +30,9 @@ public class BaseGoodsBrandRest { return baseBrandInfoService.listPage(pq); } @ApiOperation("查询所有的品牌") - @GetMapping("/listAll") - public ResultBean> listAll() { - return baseBrandInfoService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseBrandInfoService.listAll(query); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java index 0b224a707a..48d8579117 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java @@ -1,6 +1,7 @@ package com.yxt.base.apiadmin.base; import com.yxt.base.biz.base.basegoodstype.*; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -29,9 +30,9 @@ public class BaseGoodsTypeRest { return baseGoodsTypeService.listPage(pq); } @ApiOperation("查询所有的类别") - @GetMapping("/listAll") - public ResultBean> listAll() { - return baseGoodsTypeService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseGoodsTypeService.listAll(query); } @ApiOperation("保存修改") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java index 7df073896b..44324b2dbf 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java @@ -1,6 +1,7 @@ package com.yxt.base.apiadmin.base; import com.yxt.base.biz.base.basegoodsunit.*; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -29,9 +30,9 @@ public class BaseGoodsUnitRest { return baseGoodsUnitService.listPage(pq); } @ApiOperation("查询所有的类别") - @GetMapping("/listAll") - public ResultBean> listAll() { - return baseGoodsUnitService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseGoodsUnitService.listAll(query); } @ApiOperation("保存修改") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java index 0c2dfc1734..b52f73ab75 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java @@ -1,6 +1,7 @@ package com.yxt.base.apiadmin.base; import com.yxt.base.biz.base.basemanufacturer.*; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -30,9 +31,9 @@ public class BaseManufacturerRest { } @ApiOperation("查询所有的厂家") - @GetMapping("/listAll") - public ResultBean> listAll() { - return baseManufacturerService.listAll(); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return baseManufacturerService.listAll(query); } @ApiOperation("保存修改") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java index 7e5964b67b..fbae17eba6 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java @@ -10,6 +10,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.base.feign.portal.sysuser.SysUserFeign; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -99,9 +101,22 @@ public class BaseBrandInfoService extends MybatisBaseService> listAll() { + public ResultBean> listAll(@RequestBody OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1")); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid)); return rb.success().setData(pagging); } public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java index 2e5b3c8e20..0dad44983c 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java @@ -11,6 +11,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.base.feign.portal.sysuser.SysUserFeign; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -110,10 +112,25 @@ public class BaseGoodsTypeService extends MybatisBaseService> listAll() { + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) - .ne("isDelete","1")); + .ne("isDelete","1") + .eq("useOrgSid",useOrgSid) + ); return rb.success().setData(pagging); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java index ca2ceb6683..764a8de26d 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java @@ -11,6 +11,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.base.feign.portal.sysuser.SysUserFeign; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -89,9 +91,25 @@ public class BaseGoodsUnitService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); - } public ResultBean> listAll() { + } public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1") + .eq("useOrgSid",useOrgSid) + ); return rb.success().setData(pagging); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java index 460029c1ce..dea379a273 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java @@ -11,6 +11,7 @@ import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.base.feign.portal.sysuser.SysUserFeign; +import com.yxt.base.utils.OrgPathQuery; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -19,6 +20,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -91,10 +93,25 @@ public class BaseManufacturerService extends MybatisBaseService records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean> listAll() { + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) - .ne("isDelete","1")); + .ne("isDelete","1") + .eq("useOrgSid",useOrgSid) + ); return rb.success().setData(pagging); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java new file mode 100644 index 0000000000..f1da844d4d --- /dev/null +++ b/yxt-base-biz/src/main/java/com/yxt/base/utils/OrgPathQuery.java @@ -0,0 +1,13 @@ +package com.yxt.base.utils; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/5/17 14:15 + */ +@Data +public class OrgPathQuery { + private String orgPath; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java index d912440b1d..e6a03fcbca 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java @@ -19,7 +19,7 @@ public interface WmsWarehouseAreaMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsWarehouseAreaVo initialization (@Param("sid") String sid); int updateBySidIsDelete(List list); - @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}") + @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid} and isDelete = 0 and isEnable = 1") List selectAll(String ckSid); WmsWarehouseArea checkForInsert(@Param("areaCode")String areaCode, @Param("warehouseSid")String warehouseSid); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index 2542512dfa..780a69d224 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java @@ -140,6 +140,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService