From 1fc23af95b2500bc655dc85479233ec80bc0fde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Fri, 27 Feb 2026 08:59:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?WMS=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=8D=E5=90=88=E4=B8=8B=E5=8F=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/listener/ExcelParseService.java | 2 ++ .../stockOutOrder/service/StockOutOrderDomainService.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java index 237ecc575..eda236076 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java @@ -132,6 +132,8 @@ public class ExcelParseService { stockOutOrder.setUpdateTime(new Date()); stockOutOrder.setDelFlag(1); } + // 复核下发状态默认为否（2） + stockOutOrder.setCheckTaskDistribution(2); //校验必填字段 StringBuilder errorMsg = check(stockOutOrder); if (errorMsg.length() > 0) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 6f1d295d9..10a5b5862 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -154,6 +154,10 @@ public class StockOutOrderDomainService { //统计总体积 //BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); //stockOutOrderDO.setVolumeLimit(volumeLimit); + // 复核下发状态默认为否（2） + if (stockOutOrderDO.getCheckTaskDistribution() == null) { + stockOutOrderDO.setCheckTaskDistribution(2); + } stockOutOrderService.insert(stockOutOrderDO); return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); } @@ -180,6 +184,10 @@ public class StockOutOrderDomainService { //统计总体积 BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); stockOutOrderDO.setVolumeLimit(volumeLimit); + // 复核下发状态默认为否（2） + if (stockOutOrderDO.getCheckTaskDistribution() == null) { + stockOutOrderDO.setCheckTaskDistribution(2); + } stockOutOrderService.insert(stockOutOrderDO); outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); } From 24b1f521101edb341b480a657360fe89d2c88c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Fri, 27 Feb 2026 09:04:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?WMS=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=8D=E5=90=88=E4=B8=8B=E5=8F=91=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 10a5b5862..98acc245a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -699,7 +699,7 @@ public class StockOutOrderDomainService { stockOutOrderDOQuery.setCheckTaskDistribution(2); List stockOutOrderPOList = stockOutOrderService.queryList(stockOutOrderDOQuery); if (CollectionUtils.isEmpty(stockOutOrderPOList)) { - throw new ServiceException("收货单不存在或已下发，请重新选择"); + throw new ServiceException("复合单已下发，请重新选择"); } //复核下发任务 genDeliveTask(stockOutOrderPOList, stockOutOrderDO); From ca5044aa04a0279e6198df283c5ddb9be5909bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Fri, 27 Feb 2026 09:16:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?WMS=E6=8B=A3=E8=B4=A7=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=98=8E=E7=BB=86=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickingMaterialDetail/PickingMaterialDetailMapper.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml index 8aced6370..acac70264 100644 --- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml @@ -54,6 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -67,7 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.storage_location_id, a.storage_location_code, a.storage_location_name, a.remark, a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO, a.EXT_ATTR_1, a.EXT_ATTR_2, a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4, - a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag + a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, + a.total_area, a.total_gross_weight, a.total_net_weight, a.total_volume, a.out_unique_id