From 9fd617fea7192d699ad93d56e3c2c97deafb815e Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 18 Jul 2024 08:43:42 +0800 Subject: [PATCH] 7/18 --- .../warehouse/apiadmin/WarehouseAreaRest.java | 7 ++++--- .../apiadmin/WarehouseAreaTypeRest.java | 7 ++++--- .../warehouse/apiadmin/WarehouseInfoRest.java | 7 ++++--- .../warehouse/apiadmin/WarehouseRackRest.java | 7 ++++--- .../apiadmin/WarehouseRegionRest.java | 7 ++++--- .../biz/warehousearea/WarehouseArea.java | 9 +++----- .../biz/warehousearea/WarehouseAreaDto.java | 3 +++ .../warehousearea/WarehouseAreaMapper.java | 1 + .../biz/warehousearea/WarehouseAreaMapper.xml | 9 ++++++++ .../warehousearea/WarehouseAreaService.java | 21 ++++++++++++------- .../biz/warehousearea/WarehouseAreaVo.java | 3 +++ .../WarehouseAreaTypeDto.java | 2 ++ .../WarehouseAreaTypeMapper.java | 1 + .../WarehouseAreaTypeMapper.xml | 9 ++++++++ .../WarehouseAreaTypeService.java | 10 ++++++--- .../WarehouseAreaTypeVo.java | 2 ++ .../biz/warehouseinfo/WarehouseInfoDto.java | 1 + .../warehouseinfo/WarehouseInfoMapper.java | 1 + .../biz/warehouseinfo/WarehouseInfoMapper.xml | 9 ++++++++ .../warehouseinfo/WarehouseInfoService.java | 12 +++++++---- .../biz/warehouseinfo/WarehouseInfoVo.java | 2 ++ .../biz/warehouserack/WarehouseRack.java | 8 ++----- .../biz/warehouserack/WarehouseRackDto.java | 4 ++++ .../warehouserack/WarehouseRackMapper.java | 1 + .../biz/warehouserack/WarehouseRackMapper.xml | 9 ++++++++ .../warehouserack/WarehouseRackService.java | 10 ++++++--- .../biz/warehouserack/WarehouseRackVo.java | 5 ++++- .../warehouseregion/WarehouseRegionDto.java | 2 ++ .../WarehouseRegionMapper.java | 1 + .../warehouseregion/WarehouseRegionMapper.xml | 9 ++++++++ .../WarehouseRegionService.java | 10 +++++++-- .../warehouseregion/WarehouseRegionVo.java | 2 ++ .../com/yxt/warehouse/utils/OrgPathQuery.java | 14 +++++++++++++ 33 files changed, 157 insertions(+), 48 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java index cd3a982..c122a87 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java @@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehousearea.*; +import com.yxt.warehouse.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,9 +32,9 @@ public class WarehouseAreaRest { return wmsWarehouseAreaService.listPage(pq); } @ApiOperation("查询所有的库区") - @GetMapping("/listAll") - public ResultBean listAll() { - return wmsWarehouseAreaService.getAllType(); + @PostMapping("/listAll") + public ResultBean listAll(@RequestBody OrgPathQuery query) { + return wmsWarehouseAreaService.getAllType( query); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java index d6c7b5a..09c098b 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java @@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehouseareatype.*; +import com.yxt.warehouse.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,9 +32,9 @@ public class WarehouseAreaTypeRest { return wmsWarehouseAreaTypeService.listPage(pq); } @ApiOperation("查询所有的") - @GetMapping("/listAll/{useOrgSid}") - public ResultBean> listAll(@PathVariable("useOrgSid") String useOrgSid) { - return wmsWarehouseAreaTypeService.listAll(useOrgSid); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return wmsWarehouseAreaTypeService.listAll(query); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index 1d19db6..0c34d5d 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -8,6 +8,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType; import com.yxt.warehouse.biz.warehouseinfo.*; +import com.yxt.warehouse.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -33,9 +34,9 @@ public class WarehouseInfoRest { return wmsWarehouseService.listPage(pq); } @ApiOperation("查询所有的仓库") - @GetMapping("/listAll/{useOrgSid}") - public ResultBean> listAll(@PathVariable("useOrgSid") String useOrgSid) { - return wmsWarehouseService.listAll(useOrgSid); + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return wmsWarehouseService.listAll(query); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java index 7ba5016..74ebdc2 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java @@ -6,6 +6,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehouserack.*; +import com.yxt.warehouse.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -29,9 +30,9 @@ public class WarehouseRackRest { return wmsWarehouseRackService.listPage(pq); } @ApiOperation("查询所有的库区") - @GetMapping("/getAllType") - public ResultBean getAllType() { - return wmsWarehouseRackService.getAllType(); + @PostMapping("/getAllType") + public ResultBean getAllType(@RequestBody OrgPathQuery query) { + return wmsWarehouseRackService.getAllType(query); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java index 8ece9df..afe1195 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRegionRest.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehouseregion.*; +import com.yxt.warehouse.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -26,9 +27,9 @@ public class WarehouseRegionRest { return warehouseRegionService.listPage(pq); } @ApiOperation("查询所有的库区") - @GetMapping("/listAll") - public ResultBean listAll() { - return warehouseRegionService.listAll(); + @PostMapping("/listAll") + public ResultBean listAll(@RequestBody OrgPathQuery query) { + return warehouseRegionService.listAll(query); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java index aaf986b..427f3e8 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java @@ -9,12 +9,7 @@ import lombok.Data; */ @Data public class WarehouseArea extends BaseEntity { -// private String id; -// private String sid= UUID.randomUUID().toString(); -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// private Date createTime; -// private String remarks; -// private String isEnable; + private String areaName;//库位名称 private String areaCode;//库位编码 private String warehouseSid;//仓库sid @@ -22,4 +17,6 @@ public class WarehouseArea extends BaseEntity { private String unit;//计量单位 private String areaTypeSid;//货区类型 private String useOrgSid; + private String createOrgSid;//创建组织sid + } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java index 3ee58e4..d6011e7 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java @@ -25,4 +25,7 @@ public class WarehouseAreaDto implements Dto { private String unit;//计量单位 private String areaTypeSid;//货区类型 private String useOrgSid; + private String createOrgSid;//创建组织sid + private String userSid; + private String orgPath; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java index b89acdf..28bc851 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java @@ -21,4 +21,5 @@ public interface WarehouseAreaMapper extends BaseMapper { int updateBySidIsDelete(List list); @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}") List selectAll(String ckSid); + List listAll(@Param("orgPath")String orgPath); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml index bb74688..24cc6d5 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml @@ -15,6 +15,15 @@ ${ew.sqlSegment} + + + UPDATE warehouse_info SET isDelete=1 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java index 70e552f..881c378 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -15,6 +15,8 @@ import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; +import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo; +import com.yxt.warehouse.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -80,10 +82,9 @@ public class WarehouseInfoService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } - public ResultBean> listAll(String useOrgSid) { + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) - .eq("useOrgSid",useOrgSid).eq("isDelete","0")); + List pagging = baseMapper.listAll(query.getOrgPath()); return rb.success().setData(pagging); } @@ -108,7 +109,9 @@ public class WarehouseInfoService extends MybatisBaseService wmsWarehouseExtendVos; + private String userSid; + private String orgPath; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java index ac979e5..5c3e235 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java @@ -9,14 +9,10 @@ import lombok.Data; */ @Data public class WarehouseRack extends BaseEntity { -// private String id; -// private String sid= UUID.randomUUID().toString(); -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// private Date createTime; -// private String remarks; -// private String isEnable; private String rackName;//货架名称 private String rackCode;//货架编码 private String warehouseSid;//仓库sid private String locationSid;//库位sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java index 5bde869..5b83c3f 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java @@ -22,4 +22,8 @@ public class WarehouseRackDto implements Dto { private String rackCode;//货架编码 private String warehouseSid;//仓库sid private String locationSid;//库位sid + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + private String userSid; + private String orgPath; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java index 3de02e2..991b44b 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java @@ -18,4 +18,5 @@ public interface WarehouseRackMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WarehouseRackVo initialization (@Param("sid") String sid); int updateBySidIsDelete(List list); + List listAll(@Param("orgPath")String orgPath); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml index 5341835..07d435e 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml @@ -15,6 +15,15 @@ ${ew.sqlSegment} + + UPDATE warehouse_region SET isDelete=1 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java index 6198be1..b5cc6c4 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java @@ -14,6 +14,8 @@ import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; +import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo; +import com.yxt.warehouse.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,9 +57,9 @@ public class WarehouseRegionService extends MybatisBaseService 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).ne("isDelete","1")); + List pagging = baseMapper.listAll(query.getOrgPath()); return rb.success().setData(pagging); } @@ -82,6 +84,9 @@ public class WarehouseRegionService extends MybatisBaseService wmsWarehouseExtendVos; + private String userSid; + private String orgPath; } diff --git a/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java b/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java new file mode 100644 index 0000000..440f972 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java @@ -0,0 +1,14 @@ +package com.yxt.warehouse.utils; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/5/17 14:15 + */ +@Data +public class OrgPathQuery { + private String orgPath; + private String userOrgSid; +}