From b27f45fadb0141f100b3d313207a8a3c57555aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Tue, 17 Mar 2026 10:14:44 +0800
Subject: [PATCH] =?UTF-8?q?PC=E5=A4=8D=E6=A0=B8=E6=95=B0=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockOutOrder/service/StockOutOrderDomainService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 41928f335..ac01403be 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
@@ -820,11 +820,11 @@ public class StockOutOrderDomainService {
                     waitQty = BigDecimal.ZERO;
                 }
                 outMaterialDetailPO.setWaitCheckQuantity(waitQty);
-                // quantity=PC下发时的拣货数量，actualQuantity默认=待复核数量
+                // quantity=PC下发时的拣货数量，actualQuantity：已复核则取checkQuantity，否则取待复核数量
                 if (pickQty != null) {
                     outMaterialDetailPO.setQuantity(pickQty);
                 }
-                outMaterialDetailPO.setActualQuantity(waitQty);
+                outMaterialDetailPO.setActualQuantity(checkQty.compareTo(BigDecimal.ZERO) > 0 ? checkQty : waitQty);
             }
             List<OutMaterialDetailPO> children = outMaterialDetailPO.getChildren();
             if (!CollectionUtils.isEmpty(children)) {
@@ -852,11 +852,11 @@ public class StockOutOrderDomainService {
                             waitQtyChild = BigDecimal.ZERO;
                         }
                         outMaterialDetailPOChild.setWaitCheckQuantity(waitQtyChild);
-                        // quantity=PC下发时的拣货数量，actualQuantity默认=待复核数量
+                        // quantity=PC下发时的拣货数量，actualQuantity：已复核则取checkQuantity，否则取待复核数量
                         if (pickQtyChild != null) {
                             outMaterialDetailPOChild.setQuantity(pickQtyChild);
                         }
-                        outMaterialDetailPOChild.setActualQuantity(waitQtyChild);
+                        outMaterialDetailPOChild.setActualQuantity(checkQtyChild.compareTo(BigDecimal.ZERO) > 0 ? checkQtyChild : waitQtyChild);
                     }
                 }
             }