From 23984e69d67c514aa94d6a8c9b39707e4d267109 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, 28 Jul 2026 11:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=BA=93=E5=AD=98=E8=B4=A7?=
 =?UTF-8?q?=E4=B8=BB=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=A4=8D=E6=A0=B8=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockOutOrder/StockOutOrderApplicationService.java     | 3 ---
 .../repository/persistence/MaterialInventoryImpl.java      | 7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index 8e6556798..26de7300b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -282,9 +282,6 @@ public class StockOutOrderApplicationService {
                 stockOutOrderPO.setMaterialQuantity(cnt);
             }
 
-            BigDecimal checkSum = (mag != null && mag.getCheckQuantitySum() != null)
-                    ? mag.getCheckQuantitySum() : BigDecimal.ZERO;
-            stockOutOrderPO.setCheckQuantity(checkSum);
             stockOutOrderPO.setReceiptOrderAccountList(
                     accountByOrderId.getOrDefault(stockOutOrderPO.getOutOrderId(), Collections.emptyList()));
         }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
index eab84edbf..8b25a0600 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
@@ -819,7 +819,12 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventory.setNetWeight(netWeight);
             materialInventory.setMaterialBaseInfoId(materialInventoryParamDO.getMaterialBaseInfoId());
             materialInventory.setInOrderNumber(materialInventoryParamDO.getInOrderNumber());
-            if (materialBaseInfo != null) {
+            // 优先使用上游传入的货主信息（如来自上架单），否则再从物料基础信息兜底
+            if (materialInventoryParamDO.getShipperId() != null) {
+                materialInventory.setShipperId(materialInventoryParamDO.getShipperId());
+                materialInventory.setShipperName(materialInventoryParamDO.getShipperName());
+                materialInventory.setShipperCode(materialInventoryParamDO.getShipperCode());
+            } else if (materialBaseInfo != null) {
                 materialInventory.setShipperId(materialBaseInfo.getShipperId());
                 materialInventory.setShipperName(materialBaseInfo.getShipperName());
                 materialInventory.setShipperCode(materialBaseInfo.getShipperCode());