From 17e1937be4e882399012c4542e2c00548629424b 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, 28 Jan 2026 14:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=8A=A0?=
 =?UTF-8?q?=E9=94=81;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandoverTaskOrderDomainService.java       | 21 ++++++++++++-------
 .../persistence/OutMaterialDetailImpl.java    | 10 ++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
index 2b56cf227..7bd508546 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
@@ -143,10 +143,22 @@ public class HandoverTaskOrderDomainService {
             return false;
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        //修改库存
+        xgkc(handoverTaskOrderIds,loginUser);
+        return handoverTaskOrderService.update(null, new UpdateWrapper<HandoverTaskOrder>().lambda()
+                .set(HandoverTaskOrder::getStatus, 2)
+                .set(HandoverTaskOrder::getUpdateBy, loginUser.getUserid())
+                .set(HandoverTaskOrder::getUpdateByName, loginUser.getUsername())
+                .set(HandoverTaskOrder::getUpdateTime, new Date())
+                .in(HandoverTaskOrder::getHandoverTaskOrderId, handoverTaskOrderDO.getHandoverTaskOrderIds())
+        );
+    }
+
+    public synchronized void xgkc(List<Long> handoverTaskOrderIds,LoginUser loginUser) {
         for (Long handoverTaskOrderId : handoverTaskOrderIds) {
             HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getById(handoverTaskOrderId);
             if (handoverTaskOrder == null) {
-                return false;
+                return;
             }
             //交接完成节点修改库存
             String orderNumber = handoverTaskOrder.getOrderNumber();
@@ -212,12 +224,5 @@ public class HandoverTaskOrderDomainService {
                 }
             }
         }
-        return handoverTaskOrderService.update(null, new UpdateWrapper<HandoverTaskOrder>().lambda()
-                .set(HandoverTaskOrder::getStatus, 2)
-                .set(HandoverTaskOrder::getUpdateBy, loginUser.getUserid())
-                .set(HandoverTaskOrder::getUpdateByName, loginUser.getUsername())
-                .set(HandoverTaskOrder::getUpdateTime, new Date())
-                .in(HandoverTaskOrder::getHandoverTaskOrderId, handoverTaskOrderDO.getHandoverTaskOrderIds())
-        );
     }
 }
\ No newline at end of file
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 3feab647b..66b0b3050 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
@@ -291,7 +291,13 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         stockOutOrderPO.setAllocationQuantity(totalAllocationQuantity);
         //保存物料明细信息
         saveOrUpdateBatch(outMaterialDetailList);
-        //分配
+        //分配(修改库存)
+        xgkc(outMaterialDetailList,stockOutOrderPO,loginUser);
+
+        return stockOutOrderPO;
+    }
+
+    public synchronized void xgkc(List<OutMaterialDetail> outMaterialDetailList,StockOutOrderPO stockOutOrderPO,LoginUser loginUser) {
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
             BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity();
@@ -348,8 +354,6 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             }
         }
-
-        return stockOutOrderPO;
     }
 
     /**