From 6bde65731010f28ba22790ca0f3b489e58cc54b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 16:25:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/StockOutOrderApplicationService.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 200e3ab3d..91cb863a0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -867,16 +867,7 @@ public class StockOutOrderApplicationService { returnOutMaterialDetailDOChild.setLevel(2); returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId()); BigDecimal allocationQuantity1 = returnOutMaterialDetailDOChild.getAllocationQuantity(); - BigDecimal alreadyAllocationQuantity1 = returnOutMaterialDetailDOChild.getAlreadyAllocationQuantity(); - if (allocationQuantity1 == null) { - allocationQuantity1 = BigDecimal.ZERO; - } - if (alreadyAllocationQuantity1 == null) { - alreadyAllocationQuantity1 = BigDecimal.ZERO; - } - BigDecimal nowAllocationQuantity1 = allocationQuantity1.subtract(alreadyAllocationQuantity1); returnOutMaterialDetailDOChild.setAlreadyAllocationQuantity(allocationQuantity1); - returnOutMaterialDetailDOChild.setNowAllocationQuantity(nowAllocationQuantity1); returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild); totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity()); } From ddb7936211f740f27028d35e57a63c970221ede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 16:31:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/stockOutOrder/StockOutOrderApplicationService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 91cb863a0..2e678768c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -866,8 +866,6 @@ public class StockOutOrderApplicationService { returnOutMaterialDetailDOChild.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); returnOutMaterialDetailDOChild.setLevel(2); returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId()); - BigDecimal allocationQuantity1 = returnOutMaterialDetailDOChild.getAllocationQuantity(); - returnOutMaterialDetailDOChild.setAlreadyAllocationQuantity(allocationQuantity1); returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild); totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity()); } From 3c42db9a1475741f52443d90e26c3555904ead9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 16:49:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/StockOutOrderApplicationService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 2e678768c..7872b7407 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -851,8 +851,8 @@ public class StockOutOrderApplicationService { continue; } OutMaterialDetailDO returnOutMaterialDetailDOChild = new OutMaterialDetailDO(); - BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, "materialDetailId","createBy","createByName","createTime", - "updateBy","updateByName","updateTime"); + /*BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, "materialDetailId","createBy","createByName","createTime", + "updateBy","updateByName","updateTime");*/ BeanUtils.copyProperties(outMaterialDetailDOChild, returnOutMaterialDetailDOChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild)); if (ObjectUtil.isNotNull(returnOutMaterialDetailDOChild.getMaterialDetailId()) && returnOutMaterialDetailDOChild.getMaterialDetailId() == 0){ returnOutMaterialDetailDOChild.setMaterialDetailId(null); From 27797ddb7387cd90ee8b3dd6e5d80ddfde3f68e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 16:55:32 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/StockOutOrderApplicationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 7872b7407..8ef56fa3a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -851,8 +851,9 @@ public class StockOutOrderApplicationService { continue; } OutMaterialDetailDO returnOutMaterialDetailDOChild = new OutMaterialDetailDO(); - /*BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, "materialDetailId","createBy","createByName","createTime", - "updateBy","updateByName","updateTime");*/ + BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, + "materialDetailId","createBy","createByName","createTime", + "updateBy","updateByName","updateTime","alreadyAllocationQuantity"); BeanUtils.copyProperties(outMaterialDetailDOChild, returnOutMaterialDetailDOChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild)); if (ObjectUtil.isNotNull(returnOutMaterialDetailDOChild.getMaterialDetailId()) && returnOutMaterialDetailDOChild.getMaterialDetailId() == 0){ returnOutMaterialDetailDOChild.setMaterialDetailId(null); From a6638319118a23481eacfd8040051fecfe58607a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 16:59:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 0864d47a8..5a4d310c1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -293,6 +293,7 @@ public class OutMaterialDetailImpl extends ServiceImpl Date: Sat, 28 Feb 2026 17:06:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 5a4d310c1..7979f059b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -282,7 +282,7 @@ public class OutMaterialDetailImpl extends ServiceImpl