From 1d01431354ed694fdcd030272d5127f3e0f137cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 12 Aug 2026 15:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=B8=BB=E8=B4=A6=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=A4=84=E7=90=86;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderApplicationService.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
index 348f3b829..fe3a31e02 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
@@ -136,13 +136,13 @@ public class ReservationStockInOrderApplicationService {
                 }
             }
             // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
-            if (stockInOrderDO.getWarehouseId() == null) {
-                AssociationWarehouseCacheDO associationWarehouseCacheDO =
-                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-                if (associationWarehouseCacheDO != null) {
-                    stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
-                }
-            }
+//            if (stockInOrderDO.getWarehouseId() == null) {
+//                AssociationWarehouseCacheDO associationWarehouseCacheDO =
+//                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+//                if (associationWarehouseCacheDO != null) {
+//                    stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+//                }
+//            }
         }
 
         // 库管角色过滤：不展示已创建（status=1）的入库单