From ca4af50c0bbd6fb11d5811650bcbbf1437671290 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, 3 Mar 2026 16:55:15 +0800
Subject: [PATCH] =?UTF-8?q?WMS=E7=A7=BB=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A7=BB=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/MaterialInventoryImpl.java      | 17 ++++++++++++++++-
 1 file changed, 16 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 89b82b5cc..04e7a8139 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
@@ -212,7 +212,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             }
 
             //TODO 若数据量升级 后期优化
-            // 查询现有库存时，按唯一索引(storage_location_id, material_base_info_id, shipper_id) 查询
+            // 查询现有库存时，按 库位 + 物料 + 货主 + 批次 + 物料状态 + 容器 维度查询，避免多条命中
             MaterialInventory materialInventoryDb = null;
 
             if (materialInventoryDO.getStorageLocationId() != null && materialInventoryDO.getMaterialBaseInfoId() != null) {
@@ -226,6 +226,21 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                 if (shipperId != null) {
                     wrapper.eq(MaterialInventory::getShipperId, shipperId);
                 }
+                // 如果有批次号，则再按批次号细分（优先使用上面解析出来的 batchNumber）
+                if (!StringUtils.isEmpty(batchNumber)) {
+                    wrapper.eq(MaterialInventory::getBatchNumber, batchNumber);
+                } else if (materialInventoryDO.getBatchNumber() != null) {
+                    wrapper.eq(MaterialInventory::getBatchNumber, materialInventoryDO.getBatchNumber());
+                }
+                // 如果有物料状态码，则再按物料状态细分
+                if (materialInventoryDO.getMaterialStatusCode() != null
+                        && !materialInventoryDO.getMaterialStatusCode().trim().isEmpty()) {
+                    wrapper.eq(MaterialInventory::getMaterialStatusCode, materialInventoryDO.getMaterialStatusCode());
+                }
+                // 如果有容器ID，则再按容器细分
+                if (materialInventoryDO.getContainerId() != null) {
+                    wrapper.eq(MaterialInventory::getContainerId, materialInventoryDO.getContainerId());
+                }
                 materialInventoryDb = materialInventoryMapper.selectOne(wrapper);
             }