From 7c6745bdd151d05c69fbd62cf352dbf98ee46571 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:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandoverTaskOrderDomainService.java       |  6 +++---
 .../persistence/OutMaterialDetailImpl.java    | 21 ++++++++++++-------
 2 files changed, 16 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 7bd508546..50fa90ea8 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
@@ -197,9 +197,9 @@ public class HandoverTaskOrderDomainService {
                     inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
                     inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
                     inventoryAdjustmentRecord.setTopOrganizationId(stockOutOrder.getTopOrganizationId());
-                    inventoryAdjustmentRecord.setWarehouseCode(materialInventoryPO.getWarehouseCode());
-                    inventoryAdjustmentRecord.setWarehouseName(materialInventoryPO.getWarehouseName());
-                    inventoryAdjustmentRecord.setWarehouseId(materialInventoryPO.getWarehouseId());
+                    inventoryAdjustmentRecord.setWarehouseCode(stockOutOrder.getWarehouseCode());
+                    inventoryAdjustmentRecord.setWarehouseName(stockOutOrder.getWarehouseName());
+                    inventoryAdjustmentRecord.setWarehouseId(stockOutOrder.getWarehouseId());
                     inventoryAdjustmentRecord.setStorageCode(materialInventoryPO.getStorageCode());
                     inventoryAdjustmentRecord.setStorageName(materialInventoryPO.getStorageName());
                     inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
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 66b0b3050..73700d38f 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
@@ -31,6 +31,8 @@ import com.mhd.wms.domain.outMaterialDetailSerialNumber.entity.OutMaterialDetail
 import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.facade.IOutMaterialDetailSerialNumberService;
 import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
 import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail;
+import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
+import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper;
 import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +68,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
     private InventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper;
     @Autowired
     private MaterialBaseInfoMapper materialBaseInfoMapper;
+    @Autowired
+    private StockOutOrderMapper stockOutOrderMapper;
 
     /**
      * 查询物料明细列表
@@ -298,6 +302,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
     }
 
     public synchronized void xgkc(List<OutMaterialDetail> outMaterialDetailList,StockOutOrderPO stockOutOrderPO,LoginUser loginUser) {
+        StockOutOrder stockOutOrder = stockOutOrderMapper.selectById(stockOutOrderPO.getOutOrderId());
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
             BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity();
@@ -325,12 +330,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                 inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
-                inventoryAdjustmentRecord.setOrganizationId(stockOutOrderPO.getOrganizationId());
-                inventoryAdjustmentRecord.setOrganizationName(stockOutOrderPO.getOrganizationName());
-                inventoryAdjustmentRecord.setTopOrganizationId(stockOutOrderPO.getTopOrganizationId());
-                inventoryAdjustmentRecord.setWarehouseCode(stockOutOrderPO.getWarehouseCode());
-                inventoryAdjustmentRecord.setWarehouseName(stockOutOrderPO.getWarehouseName());
-                inventoryAdjustmentRecord.setWarehouseId(stockOutOrderPO.getWarehouseId());
+                inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
+                inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
+                inventoryAdjustmentRecord.setTopOrganizationId(stockOutOrder.getTopOrganizationId());
+                inventoryAdjustmentRecord.setWarehouseCode(stockOutOrder.getWarehouseCode());
+                inventoryAdjustmentRecord.setWarehouseName(stockOutOrder.getWarehouseName());
+                inventoryAdjustmentRecord.setWarehouseId(stockOutOrder.getWarehouseId());
                 inventoryAdjustmentRecord.setStorageCode(materialInventoryPO.getStorageCode());
                 inventoryAdjustmentRecord.setStorageName(materialInventoryPO.getStorageName());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
@@ -338,8 +343,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setStorageLocationName(materialInventoryPO.getStorageLocationName());
                 inventoryAdjustmentRecord.setMaterialInventoryId(materialInventoryPO.getMaterialInventoryId());
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
-                inventoryAdjustmentRecord.setShipperId(stockOutOrderPO.getShipperId());
-                inventoryAdjustmentRecord.setShipperName(stockOutOrderPO.getShipperName());
+                inventoryAdjustmentRecord.setShipperId(stockOutOrder.getShipperId());
+                inventoryAdjustmentRecord.setShipperName(stockOutOrder.getShipperName());
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());