From 2094ea31cd8cb6bd40b26c25f202e97aa24a13b7 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Fri, 11 Sep 2026 13:52:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E4=BB=93=E5=BA=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9C=AC=E5=9C=B0=E5=85=9C=E5=BA=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89STOCK=5FLOCK=5FMODE=E5=88=97,=20=E5=85=9C?=
 =?UTF-8?q?=E5=BA=95=E4=B8=8D=E4=BE=9D=E8=B5=96=E5=86=BB=E7=BB=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=97,=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E8=AF=A5?=
 =?UTF-8?q?=E5=88=97=E7=8E=AF=E5=A2=83=E7=9A=84=E4=B8=8B=E5=8F=91=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/mapper/ReservationStockInOrderMapper.java   | 5 +++--
 .../ReservationStockInOrderMapper.xml                      | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
index d43721560..9f47433f4 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
@@ -55,8 +55,9 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
     public String getWarehouseName(@Param("id") Long id);
 
     /**
-     * 本地跨库直查仓库信息(编码/名称/单号规则/库存锁定模式),
-     * 供下发等流程在 system 服务 Feign 失败/降级时兜底, 与 getWarehouseInfoByWarehouseId Feign 接口同数据源
+     * 本地跨库直查仓库信息(编码/名称/单号生成规则),
+     * 供下发等流程在 system 服务 Feign 失败/降级时兜底, 与 getWarehouseInfoByWarehouseId Feign 接口同数据源。
+     * 不含 STOCK_LOCK_MODE(冻结功能列, 各环境库结构不一致), 兜底时 stockLockMode 为 null 即默认分配库存冻结模式
      */
     public com.mhd.system.api.domain.WarehouseFeignPO getWarehouseInfoFallback(@Param("id") Long id);
 
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 2974a379e..26b745141 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -592,14 +592,15 @@
         select WAREHOUSE_CODE from "NGWL_TEST_SYSTEM".WAREHOUSE where 1 = 1 and DEL_FLAG = 1 and  WAREHOUSE_ID = #{id} limit 1
     </select>
 
-    <!-- 本地跨库直查仓库信息: 下发/下单冻结等流程 Feign 获取仓库信息失败/降级时兜底(与 system 服务同库同表) -->
+    <!-- 本地跨库直查仓库信息: 下发/保存等流程 Feign 获取仓库信息失败/降级时兜底(与 system 服务同库同表)。
+         注意不含 STOCK_LOCK_MODE(冻结功能列, 各环境库结构不一致, 兜底路径不依赖冻结功能的列;
+         stockLockMode 走 Feign 正常路径获取, 兜底时为 null 即默认"分配库存冻结"模式) -->
     <select id="getWarehouseInfoFallback" parameterType="java.lang.Long" resultType="com.mhd.system.api.domain.WarehouseFeignPO">
         select WAREHOUSE_CODE              as warehouseCode,
                WAREHOUSE_NAME              as warehouseName,
                ORDER_NO_GENERATE_RULE      as orderNoGenerateRule,
                OUT_ORDER_NO_PREFIX         as outOrderNoPrefix,
-               SAMPLE_OUT_ORDER_NO_PREFIX  as sampleOutOrderNoPrefix,
-               STOCK_LOCK_MODE             as stockLockMode
+               SAMPLE_OUT_ORDER_NO_PREFIX  as sampleOutOrderNoPrefix
         from "NGWL_TEST_SYSTEM".WAREHOUSE
         where 1 = 1 and DEL_FLAG = 1 and WAREHOUSE_ID = #{id} limit 1
     </select>