From 9c6f1c851679e54239b0041326b44ac8d93b41b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Wed, 16 Sep 2026 13:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=A0=88=E6=9D=BF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/autoWareHourceHaian/HaiAnLabelQueryMapper.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnLabelQueryMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnLabelQueryMapper.xml
index 7b62d7cb..a377ebf3 100644
--- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnLabelQueryMapper.xml
+++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnLabelQueryMapper.xml
@@ -70,8 +70,13 @@
                     )
                 )
             </if>
-            <if test="params.inStockFlag != null and params.inStockFlag != ''">
-                AND h.in_stock_flag = #{params.inStockFlag}
+            <if test="params.inStockFlag == 'Y'">
+                <!-- 是否在货架=是：只返回托盘wcs_location有实际货位的标签，空白字符串也视为不在货架 - rqrq -->
+                AND NULLIF(LTRIM(RTRIM(p.wcs_location)), '') IS NOT NULL
+            </if>
+            <if test="params.inStockFlag == 'N'">
+                <!-- 是否在货架=否：只返回托盘wcs_location为空或仅含空格的标签 - rqrq -->
+                AND NULLIF(LTRIM(RTRIM(p.wcs_location)), '') IS NULL
             </if>
             <if test="params.countFlag != null and params.countFlag != ''">
                 AND h.count_flag = #{params.countFlag}