From 2a7091a63ef4290c4afcc40fbbd7cdcfe3c85538 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Tue, 3 Mar 2026 13:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E7=BC=BA=E5=B0=91=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=92=8C=E8=B4=A7=E4=B8=BB=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/MaterialInventoryImpl.java     | 8 ++++++++
 .../shiftManage/service/ShiftManageDomainService.java     | 2 ++
 2 files changed, 10 insertions(+)

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 d4d6c2f92..4c164eeb1 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
@@ -196,6 +196,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             Long shipperId = materialInventoryDO.getShipperId();
             String shipperName = "";
             String shipperCode = "";
+            String batchNumber = "";
             if (shipperId == null && materialInventoryDO.getMaterialBaseInfoId() != null) {
 //                shipperId = materialBaseInfoIdToShipperIdMap.get(materialInventoryDO.getMaterialBaseInfoId());
                 MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoIdToShipperIdMap.get(materialInventoryDO.getMaterialBaseInfoId());
@@ -203,6 +204,12 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                 shipperName = materialBaseInfoPO.getShipperName();
                 shipperCode = materialBaseInfoPO.getShipperCode();
             }
+            if (StringUtils.isEmpty(shipperCode) || materialInventoryDO.getBatchNumber() == null) {
+                Long materialInventoryId = materialInventoryDO.getMaterialInventoryId();
+                MaterialInventory materialInventory1 = materialInventoryMapper.selectById(materialInventoryId);
+                shipperCode =  materialInventory1.getShipperCode();
+                batchNumber =  materialInventory1.getBatchNumber();
+            }
 
             //TODO 若数据量升级 后期优化
             // 查询现有库存时，按唯一索引(storage_location_id, material_base_info_id, shipper_id) 查询
@@ -242,6 +249,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                     }
                     if (StringUtils.isEmpty(materialInventory.getShipperCode())){
                         materialInventory.setShipperCode(shipperCode);
+                        materialInventory.setBatchNumber(batchNumber);
                     }
                     // 如果批次号、容器ID、物料状态等字段在唯一性约束中，应该保留；否则，使用第一个值
                     // 由于唯一性约束只包含storage_location_id和material_base_info_id，我们保留这些字段的值
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
index 4382ae38d..62c96a6fa 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
@@ -426,6 +426,7 @@ public class ShiftManageDomainService {
             shiftMaterialDetailPO.setGrossWeight(materialInventoryOldDb.getGrossWeight());
             shiftMaterialDetailPO.setVolume(materialInventoryOldDb.getVolume());
             shiftMaterialDetailPO.setArea(materialInventoryOldDb.getArea());
+            shiftMaterialDetailPO.setMaterialInventoryId(materialInventoryOldDb.getMaterialInventoryId());
             materialInventoryNowList.add(genMaterialInventory(shiftMaterialDetailPO));
             List<ShiftMaterialDetailPO> shiftMaterialDetailPOChildrenList = shiftMaterialDetailPO.getChildren();
             for (ShiftMaterialDetailPO shiftMaterialDetailPOChildren : shiftMaterialDetailPOChildrenList){
@@ -533,6 +534,7 @@ public class ShiftManageDomainService {
             materialInventoryDONow.setGrossWeight(shiftMaterialDetailPO.getGrossWeight());
             materialInventoryDONow.setVolume(shiftMaterialDetailPO.getVolume());
             materialInventoryDONow.setArea(shiftMaterialDetailPO.getArea());
+            materialInventoryDONow.setMaterialInventoryId(shiftMaterialDetailPO.getMaterialInventoryId());
             materialInventoryDONow.setOrganizationId(loginUser.getUserPo().getOrganizationId());
             materialInventoryDONow.setOrganizationName(loginUser.getUserPo().getOrganizationName());
             materialInventoryDONow.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());