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}