From bb0cd350ad75187020122fbc5f88c061264a60c5 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Tue, 15 Sep 2026 11:31:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E5=AE=8C=E6=88=90=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E5=9B=9E=E5=86=99OMS=E5=85=A5=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E8=A2=AB?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E2=80=94=E2=80=94getBusinessOrderNumber?=
 =?UTF-8?q?=E5=B8=A6ISSUE=5FSTATUS!=3D4=E8=BF=87=E6=BB=A4,=20Feign?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=85=88=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=8D=95?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=80=81=E5=90=8E=E5=BF=85=E6=9F=A5=E7=A9=BA?=
 =?UTF-8?q?,=20=E8=87=B4=E4=B8=9A=E5=8A=A1=E5=8D=95in=5Fquantity=E6=81=920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/stockShelfOrder/StockShelfOrderMapper.xml         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
index 44464f0ac..ebe5c538b 100644
--- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
@@ -217,8 +217,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getExecutionCount" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(0) from "NGWL_TEST_OMS".EXECUTION_STOCK_IN_ORDER where BUSINESS_IN_ORDER_NUMBER = #{orderNumber} and ISSUE_STATUS != 4 and DEL_FLAG = 1
     </select>
+    <!-- 完成上架回写业务单号: 不带 ISSUE_STATUS != 4 —— completeUpShelf 中 Feign 回调(returnInResult)会先把执行单 ISSUE_STATUS 置 4,
+         若此处仍过滤完成态则必查空, 导致业务单/预约单的 in_quantity 回写被 null 守卫静默跳过(20260914修复);
+         limit 1 防数据异常多行导致单值查询抛 TooManyResultsException; 保留 DEL_FLAG=1(执行单反审归档时不回写) -->
     <select id="getBusinessOrderNumber" resultType="java.lang.String" parameterType="java.lang.String">
-        select BUSINESS_IN_ORDER_NUMBER from "NGWL_TEST_OMS".EXECUTION_STOCK_IN_ORDER where IN_ORDER_NUMBER = #{orderNumber} and ISSUE_STATUS != 4 and DEL_FLAG = 1
+        select BUSINESS_IN_ORDER_NUMBER from "NGWL_TEST_OMS".EXECUTION_STOCK_IN_ORDER where IN_ORDER_NUMBER = #{orderNumber} and DEL_FLAG = 1 limit 1
     </select>
     <update id="updateOmsOrder">
         update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber} and DEL_FLAG = 1