From 51ec8e7fe0be17a456d95aaa31f7b60c454bb687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Wed, 22 Apr 2026 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=86=E9=85=8D=E5=92=8C?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=9F=E6=88=90=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B2=A1=E6=9C=89lot=E7=BC=96=E7=A0=81=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/MaterialInventoryImpl.java    | 20 ++++++++++++++++---
 .../mapper/StockShelfOrderMapper.java         |  6 +++---
 2 files changed, 20 insertions(+), 6 deletions(-)

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 7dab18412..9a5be85bc 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
@@ -584,9 +584,23 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
         inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName()  == null ? "" :  materialInventory.getMaterialStatusName());
         inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
 
-        inventoryAdjustmentRecord.setLotNumber(materialInventoryParamDO.getLotNumber());
-        inventoryAdjustmentRecord.setInOrderNumber(materialInventoryParamDO.getInOrderNumber());
-        inventoryAdjustmentRecord.setBatchNumber(materialInventoryParamDO.getBatchNumber());
+        // 分配/取消分配/完成交接(出库)：调整记录 LOT 以库存行 material_inventory.lot_number 为准；仅库存为空时再用入参兜底
+        // 其它业务（入上架、移库等）：入参优先，入参无则取库存
+        String lotForRecord;
+        if ("分配库存".equals(adjustAction) || "取消分配".equals(adjustAction) || "出库".equals(adjustAction)) {
+            lotForRecord = StringUtils.hasText(materialInventory.getLotNumber())
+                    ? materialInventory.getLotNumber() : materialInventoryParamDO.getLotNumber();
+        } else {
+            lotForRecord = StringUtils.hasText(materialInventoryParamDO.getLotNumber())
+                    ? materialInventoryParamDO.getLotNumber() : materialInventory.getLotNumber();
+        }
+        inventoryAdjustmentRecord.setLotNumber(lotForRecord);
+        String inOrderForRecord = StringUtils.hasText(materialInventoryParamDO.getInOrderNumber())
+                ? materialInventoryParamDO.getInOrderNumber() : materialInventory.getInOrderNumber();
+        inventoryAdjustmentRecord.setInOrderNumber(inOrderForRecord);
+        String batchForRecord = StringUtils.hasText(materialInventoryParamDO.getBatchNumber())
+                ? materialInventoryParamDO.getBatchNumber() : materialInventory.getBatchNumber();
+        inventoryAdjustmentRecord.setBatchNumber(batchForRecord);
         if (ObjectUtil.isNotNull(materialBaseInfo)) {
             inventoryAdjustmentRecord.setMaterialCode(materialBaseInfo.getMaterialCode());
             inventoryAdjustmentRecord.setMaterialName(materialBaseInfo.getMaterialName());
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java
index 58dd29f6a..bc8ef3859 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/mapper/StockShelfOrderMapper.java
@@ -24,9 +24,9 @@ public interface StockShelfOrderMapper extends BaseMapper<StockShelfOrder>
 
     public void updateOmsOrder(@Param("orderNumber") String orderNumber, @Param("status") Integer status, @Param("shelvesQuantity") Integer shelvesQuantity);
 
-    void updateOmsDocument(BigDecimal shelvesQuantity, BigDecimal totalNetWeight, String omsInMaterialDetail);
+    void updateOmsDocument(@Param("shelvesQuantity") BigDecimal shelvesQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("omsInMaterialDetail") String omsInMaterialDetail);
 
-    void updateOmsHandover(BigDecimal checkQuantity, BigDecimal totalNetWeight, String outOrderNumber, Long uniqueId);
+    void updateOmsHandover(@Param("checkQuantity") BigDecimal checkQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("outOrderNumber") String outOrderNumber, @Param("uniqueId") Long uniqueId);
 
-    void updateOmsDocumentLot(BigDecimal shelvesQuantity, BigDecimal totalNetWeight, String lotNumber);
+    void updateOmsDocumentLot(@Param("shelvesQuantity") BigDecimal shelvesQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("lotNumber") String lotNumber);
 }
\ No newline at end of file