From aee5295ff1d75b9beb92d395361a3bf03adb2219 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 12 Jan 2026 13:35:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsStockMapper):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=A9=BA=E5=BA=93=E4=BD=8D=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加条件判断只在传入正常库位ID时创建CTE查询
- 实现传入-1时的特殊处理逻辑，过滤actual_warehouse_id为空的记录
- 使用choose-when结构区分不同库区过滤场景
- 保留原有递归查询功能用于正常库位ID的情况
- 添加注释说明库区过滤的两种不同情况
---
 .../main/resources/mapper/klp/WmsStockMapper.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
index 5268fe66..e79c0e2f 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
@@ -91,7 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY totalQuantity DESC
     </select>
     <select id="selectVoPagePlusActual" resultType="com.klp.domain.vo.WmsStockVo">
-        <if test="rootWarehouseId != null">
+        <!-- 只在传入正常库位ID时创建CTE，传入-1时不需要CTE -->
+        <if test="rootWarehouseId != null and rootWarehouseId != -1">
             WITH RECURSIVE aw_tree AS (
                 SELECT aw.actual_warehouse_id
                 FROM wms_actual_warehouse aw
@@ -139,9 +140,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                    SUM(CASE WHEN mc.status = 1 THEN 1 ELSE 0 END) AS onTheWay
             FROM wms_material_coil mc FORCE INDEX (idx_mc_fixed_group)
                 ${ew.customSqlSegment}
+                <!-- 库区过滤条件：分两种情况 -->
                 <if test="rootWarehouseId != null">
-                    -- 过滤仓库ID：仅包含CTE查询出的根/子仓库
-                    AND mc.actual_warehouse_id IN (SELECT actual_warehouse_id FROM aw_tree)
+                    <choose>
+                        <!-- 情况1：传入-1 → 过滤actual_warehouse_id为空的记录（无库区） -->
+                        <when test="rootWarehouseId == -1">
+                            AND mc.actual_warehouse_id IS NULL
+                        </when>
+                        <!-- 情况2：传入正常库位ID → 过滤为递归查询的库位列表 -->
+                        <otherwise>
+                            AND mc.actual_warehouse_id IN (SELECT actual_warehouse_id FROM aw_tree)
+                        </otherwise>
+                    </choose>
                 </if>
             GROUP BY mc.actual_warehouse_id, mc.item_type, mc.item_id
         ) g