From 061c5bc600df76ffc0c09e45094b3b00e105baf9 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 14 Aug 2026 14:08:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=E5=87=BA=E5=85=A5=E5=BA=93=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B8=85=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StockInOrderDomainService.java          | 10 ++++++++++
 .../service/StockOutOrderDomainService.java         | 13 +++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
index bfdc6b5c2..75f4b8cbb 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
@@ -280,6 +280,16 @@ public class StockInOrderDomainService {
 //        //统计总体积
 //        BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(InMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 //        stockInOrderDO.setVolumeLimit(volumeLimit);
+        //复制新建时原单明细的收货数量、上架数量、作业数量等执行数据不能带入新单，统一清空
+        if (!CollectionUtils.isEmpty(stockInOrderDO.getMaterialDetailList())) {
+            stockInOrderDO.getMaterialDetailList().forEach(detail -> {
+                if (detail != null) {
+                    detail.setReceiptQuantity(null);
+                    detail.setShelvesQuantity(null);
+                    detail.setActualQuantity(null);
+                }
+            });
+        }
         stockInOrderService.insert(stockInOrderDO);
         return materialDetailService.batchInsert(stockInOrderDO.getInOrderNumber(), stockInOrderDO.getMaterialDetailList());
     }
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 4de4955b9..3d431a636 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
@@ -349,6 +349,19 @@ public class StockOutOrderDomainService {
         if (stockOutOrderDO.getCheckTaskDistribution() == null) {
             stockOutOrderDO.setCheckTaskDistribution(2);
         }
+        //复制新建时原单明细的库存数量、分配数量、拣货/复核数量等执行数据不能带入新单，统一清空
+        if (!CollectionUtils.isEmpty(stockOutOrderDO.getMaterialDetailList())) {
+            stockOutOrderDO.getMaterialDetailList().forEach(detail -> {
+                if (detail != null) {
+                    detail.setInventoryQuantity(null);
+                    detail.setAllocationQuantity(null);
+                    detail.setAlreadyAllocationQuantity(null);
+                    detail.setPickingQuantity(null);
+                    detail.setCheckQuantity(null);
+                    detail.setActualQuantity(null);
+                }
+            });
+        }
         stockOutOrderService.insert(stockOutOrderDO);
         return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
     }