From 0f71adbd24bd4076daf563b2065d5430ac9ba164 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 19 Jul 2024 17:40:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e71ebe4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/ss-common-warehouse.iml From 35812affaca53c3fe2525537bcd8a232293d97ad Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 22 Jul 2024 09:13:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/apiadmin/WarehouseInfoRest.java | 6 +++++ .../biz/warehouseinfo/SmsOrderHouseInfo.java | 27 +++++++++++++++++++ .../biz/warehouseinfo/SmsOrderRock.java | 23 ++++++++++++++++ .../warehouseinfo/WarehouseInfoMapper.java | 4 +++ .../biz/warehouseinfo/WarehouseInfoMapper.xml | 16 ++++++++++- .../warehouseinfo/WarehouseInfoService.java | 15 +++++++++++ 6 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index 0c34d5d..a6d4e96 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -77,4 +77,10 @@ public class WarehouseInfoRest { List wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll(); return rb.success().setData(wmsWarehouseAreaAllVos); } + + @ApiOperation("订单选择仓库") + @PostMapping("/getWareHouse") + public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) { + return wmsWarehouseService.getWareHouse(createOrgSid); + } } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java new file mode 100644 index 0000000..d456fe9 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java @@ -0,0 +1,27 @@ +package com.yxt.warehouse.biz.warehouseinfo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/22 8:54 + */ +@Data +public class SmsOrderHouseInfo { + + /** + * 仓库名称 + */ + private String warehouseName; + /** + * 仓库sid + */ + private String warehouseSid; + + + List houseRock = new ArrayList<>(); +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java new file mode 100644 index 0000000..77f83d2 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java @@ -0,0 +1,23 @@ +package com.yxt.warehouse.biz.warehouseinfo; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 8:54 + */ +@Data +public class SmsOrderRock { + + + /** + * 货位编码 + */ + private String warehouseRackCode; + /** + * 货位sid + */ + private String warehouseRackSid; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java index d32077e..715bf69 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java @@ -23,4 +23,8 @@ public interface WarehouseInfoMapper extends BaseMapper { @Select("select * from wms_warehouse_info") List selectAll(); List listAll(@Param("orgPath")String orgPath); + + List getWareHouse(@Param("createOrgSid") String createOrgSid); + + List getHouseRock(@Param("warehouseSid") String warehouseSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml index 01b48a0..085153b 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml @@ -22,6 +22,20 @@ s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' + + UPDATE warehouse_info SET isDelete=1 @@ -31,4 +45,4 @@ - \ No newline at end of file + 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 9199772..1feef56 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -172,4 +172,19 @@ public class WarehouseInfoService extends MybatisBaseService selectAll() { return baseMapper.selectAll(); } + + public ResultBean> getWareHouse(String createOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List list = baseMapper.getWareHouse(createOrgSid); + if (!list.isEmpty()) { + for (SmsOrderHouseInfo houseInfo : list) { + List houseRock = baseMapper.getHouseRock(houseInfo.getWarehouseSid()); + if (!houseRock.isEmpty()) { + houseInfo.setHouseRock(houseRock); + } + } + return rb.success().setData(list); + } + return rb.success(); + } } From d0028790eda15c58c6184a7e1a10ad16370805e3 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 23 Jul 2024 17:36:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/warehouse/apiadmin/WarehouseInventoryRest.java | 7 +++++++ .../warehouseinventory/WarehouseInventoryMapper.java | 1 + .../warehouseinventory/WarehouseInventoryMapper.xml | 10 +++++++++- .../warehouseinventory/WarehouseInventoryService.java | 4 ++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java index 291e348..7064051 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; import java.net.URLEncoder; import java.util.List; @@ -31,6 +32,7 @@ public class WarehouseInventoryRest { + @ApiOperation("分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { @@ -185,4 +187,9 @@ public class WarehouseInventoryRest { return WarehouseInventoryService.fetchEntityBySid(sid); } + @ApiOperation("根据skuSid查询商品库存") + @PostMapping("/selInventoryCountBySkuSid") + public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid) { + return WarehouseInventoryService.selInventoryCountBySkuSid(skuSid); + } } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java index 1e7f16f..d5e2629 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java @@ -52,4 +52,5 @@ public interface WarehouseInventoryMapper extends BaseMapper IPage handleGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + String selInventoryCountBySkuSid(@Param("skuSid") String skuSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml index 4f7d14c..4a1b957 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -288,4 +288,12 @@ ${ew.sqlSegment} - \ No newline at end of file + + diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java index 519339b..bf27f3d 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java @@ -451,4 +451,8 @@ public class WarehouseInventoryService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + + public String selInventoryCountBySkuSid(String skuSid) { + return baseMapper.selInventoryCountBySkuSid(skuSid); + } } From 94d6a5238e82217704290b250f844dd04b21d400 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 24 Jul 2024 08:59:33 +0800 Subject: [PATCH 4/4] .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e71ebe4..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/ss-common-warehouse.iml