From 49ba1cc8fdb41428cd08ea92f6b3527251841267 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, 10 Feb 2026 15:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=BF=87=E6=BB=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialInventoryApplicationService.java  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
index d99e00be0..80c489e30 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
@@ -56,8 +56,14 @@ public class MaterialInventoryApplicationService {
             if (topOrganizationId != null && topOrganizationId != 1){
                 materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
             }
-            AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-            materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+            // 前端有传warehouseId则优先使用传参；未传时才使用“用户关联仓库”作为默认值
+            if (materialInventoryDO.getWarehouseId() == null) {
+                AssociationWarehouseCacheDO associationWarehouseCacheDO =
+                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+                if (associationWarehouseCacheDO != null) {
+                    materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+                }
+            }
         }
         return materialInventoryDomainService.queryList(materialInventoryDO);
     }
@@ -337,8 +343,14 @@ public class MaterialInventoryApplicationService {
             if (topOrganizationId != null && topOrganizationId != 1){
                 materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
             }
-            AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-            materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+            // 前端有传warehouseId则优先使用传参；未传时才使用“用户关联仓库”作为默认值
+            if (materialInventoryDO.getWarehouseId() == null) {
+                AssociationWarehouseCacheDO associationWarehouseCacheDO =
+                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+                if (associationWarehouseCacheDO != null) {
+                    materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+                }
+            }
         }
         List<MaterialInventoryPO> materialInventoryPOS = materialInventoryDomainService.queryList(materialInventoryDO);
         if (CollectionUtils.isNotEmpty(materialInventoryPOS)){