From 3d35fef0e88ef84e3724f681d81346705a801073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 11 Feb 2026 15:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=88=86=E9=85=8D=E8=BF=87=E7=9A=84?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=8D=E5=86=8D=E4=BA=8C=E6=AC=A1=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=BA=93=E5=AD=98;=E6=8B=A3=E8=B4=A7=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=BB=8E=E7=B4=AF=E5=8A=A0=E6=94=B9=E4=B8=BA=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/OutMaterialDetailImpl.java        | 5 +++++
 .../pickingMaterialDetail/entity/PickingMaterialDetail.java  | 4 ++++
 .../repository/persistence/PickingMaterialDetailImpl.java    | 2 +-
 .../repository/po/PickingMaterialDetailPO.java               | 4 ++++
 .../repository/todo/PickingMaterialDetailDO.java             | 4 ++++
 .../pickingOrder/service/PickingOrderDomainService.java      | 3 ++-
 6 files changed, 20 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 dd780143c..3b32aeacb 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
@@ -415,6 +415,11 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
     public synchronized void xgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) {
         StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
+            BigDecimal alreadyAllocationQuantity = outMaterialDetail.getAlreadyAllocationQuantity();
+            // 如果已经分配数量大于0，则跳过本次循环（该明细已分配过，不再重复处理）
+            if (alreadyAllocationQuantity != null && alreadyAllocationQuantity.compareTo(BigDecimal.ZERO) > 0) {
+                continue;
+            }
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
             BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity();
             if (ObjectUtils.isEmpty(allocationQuantity)) {
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java
index 3ac13f27b..18c33fea3 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java
@@ -84,6 +84,10 @@ public class PickingMaterialDetail extends BaseVOEntity {
     @Excel(name = "拣货数量")
     private BigDecimal pickingQuantity;
 
+    @ApiModelProperty("已拣货数量")
+    @Excel(name = "已拣货数量")
+    private BigDecimal alreadyPickingQuantity;
+
     @ApiModelProperty("包装规格id")
     @Excel(name = "包装规格id")
     private Long packId;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
index 3757a1f66..bc752b04c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
@@ -148,7 +148,7 @@ public class PickingMaterialDetailImpl extends ServiceImpl<PickingMaterialDetail
             pickingMaterialDetail.setUnitCode(pickingMaterialDetailDO.getUnitCode());
             pickingMaterialDetail.setUnitName(pickingMaterialDetailDO.getUnitName());
             BigDecimal actualQuantity = pickingMaterialDetailDO.getActualQuantity();
-            pickingMaterialDetail.setPickingQuantity(pickingMaterialDetailDb.getPickingQuantity().add(actualQuantity));
+            pickingMaterialDetail.setPickingQuantity(actualQuantity);
             pickingMaterialDetailList.add(pickingMaterialDetail);
 
             //判断是否开启了序列号管理
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
index 0d22f8de9..5940c75de 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
@@ -87,6 +87,10 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
     @Excel(name = "拣货数量")
     private BigDecimal pickingQuantity;
 
+    @ApiModelProperty("已拣货数量")
+    @Excel(name = "已拣货数量")
+    private BigDecimal alreadyPickingQuantity;
+
     @ApiModelProperty("包装规格id")
     @Excel(name = "包装规格id")
     private Long packId;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java
index 2f5d1996a..01bc52198 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java
@@ -82,6 +82,10 @@ public class PickingMaterialDetailDO extends BaseVOEntity {
     @Excel(name = "拣货数量")
     private BigDecimal pickingQuantity;
 
+    @ApiModelProperty("已拣货数量")
+    @Excel(name = "已拣货数量")
+    private BigDecimal alreadyPickingQuantity;
+
     @ApiModelProperty("包装规格id")
     @Excel(name = "包装规格id")
     private Long packId;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
index aaf2e9fb0..aca68004f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
@@ -342,7 +342,8 @@ public class PickingOrderDomainService {
         PickingOrder pickingOrder = new PickingOrder();
         pickingOrder.setPickingOrderId(pickingOrderPODb.getPickingOrderId());
         pickingOrder.setStatus(2);
-        pickingOrder.setPickingQuantity(pickingOrderPODb.getPickingQuantity().add(pickingOrderPO.getPickingQuantity()));
+        pickingOrder.setPickingQuantity(pickingOrderPO.getPickingQuantity());
+        //pickingOrder.setPickingQuantity(pickingOrderPODb.getPickingQuantity().add(pickingOrderPO.getPickingQuantity()));
         pickingOrder.setPickingMaterialQuantity(pickingOrderPODb.getPickingMaterialQuantity() + pickingOrderPO.getPickingMaterialQuantity());
         pickingOrder.setUpdateBy(loginUser.getUserid());
         pickingOrder.setUpdateByName(loginUser.getUsername());