From ed1566f1ad43901249f000d03fc2fa7bc8800fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sat, 14 Mar 2026 19:37:00 +0800
Subject: [PATCH] =?UTF-8?q?PC=E5=87=BA=E5=BA=93=E5=8D=95=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/OutMaterialDetailImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 24f29b343..f388094f4 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
@@ -307,6 +307,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
             }
             if (CollectionUtil.isNotEmpty(outMaterialDetailListChild)){
                 outMaterialDetailList.addAll(outMaterialDetailListChild);
+                // 有子项时，父项不参与库存扣减，避免父项+子项重复扣减导致数量翻倍（子项已代表实际分配）
+                outMaterialDetail.setNowAllocationQuantity(BigDecimal.ZERO);
             }
             //记录收货单收货总数
             totalAllocationQuantity = totalAllocationQuantity.add(outMaterialDetail.getAlreadyAllocationQuantity());
@@ -433,7 +435,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
             BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity();
-            if (nowAllocationQuantity == null && nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+            if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) {
                 continue;
             }
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
@@ -524,7 +526,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
             BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity();
-            if (nowAllocationQuantity == null && nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+            if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) {
                 continue;
             }
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();