From 38c4d486f64d492991ed52627ca4a8f408a9ad92 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Wed, 18 Mar 2026 15:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E5=90=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=A4=9A=E4=B8=AA=E6=89=B9=E6=AC=A1=E7=A7=BB?=
 =?UTF-8?q?=E4=BD=8D=E4=BC=9A=E5=90=88=E5=B9=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/MaterialInventoryImpl.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 e99afa8d2..792cbe8cf 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
@@ -265,7 +265,11 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                 // 生成key时，需要与唯一性约束保持一致：storage_location_id + material_base_info_id + shipper_id
                 String key = (shipperId != null ? shipperId : "null") + "_"
                         + materialInventoryDO.getStorageLocationId() + "_" 
-                        + materialInventoryDO.getMaterialBaseInfoId();
+                        + materialInventoryDO.getMaterialBaseInfoId() + "_"
+                        + materialInventoryDO.getBatchRefNo() + "_"
+                        + materialInventoryDO.getBatchNumber() + "_"
+                        + materialInventoryDO.getMaterialStatusCode() + "_"
+                        + materialInventoryDO.getContainerCode();
                 
                 // 注意：如果唯一性约束包含批次号、容器ID、物料状态等字段，那么key也应该包含这些字段
                 // 但是，根据唯一性约束名称IDX_MAT_INV_LOC_MAT_ID，它应该只包含storage_location_id和material_base_info_id