From b0a332fda18d6a23775ef51a79730f6bd1b7abf0 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 11 Jul 2026 18:09:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(anneal):=20=E4=BF=AE=E5=A4=8D=E9=80=80?=
 =?UTF-8?q?=E7=81=AB=E6=80=A7=E8=83=BD=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=BA=93=E5=8C=BA=E7=AD=9B=E9=80=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除Mapper中废弃的warehouseId筛选条件
- 删除无用的wms_furnace_plan_coil关联查询
- 修复服务层出炉逻辑库区筛选逻辑
- 添加正确的退火计划钢卷库区匹配验证
- 优化钢卷筛选条件确保数据准确性
- 调整查询性能避免不必要的表连接
---
 .../service/impl/WmsAnnealPerformanceServiceImpl.java  | 10 ++++++++--
 .../resources/mapper/WmsAnnealPerformanceMapper.xml    |  8 --------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java
index e7356aefe..893cc2016 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java
@@ -157,11 +157,17 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
                                 continue;
                             }
                         }
-                        // 钢卷本身的逻辑库区筛选（coilVo.warehouseId保持不变）
                         if (bo.getCoilWarehouseId() != null) {
                             if (coilVo.getWarehouseId() == null ||
                                 !coilVo.getWarehouseId().equals(bo.getCoilWarehouseId())) {
-                                continue; // 跳过不匹配的钢卷
+                                continue;
+                            }
+                        }
+                        // 出炉逻辑库区筛选（planCoil.logicWarehouseId是加工后去向）
+                        if (bo.getWarehouseId() != null) {
+                            if (planCoil.getLogicWarehouseId() == null ||
+                                !planCoil.getLogicWarehouseId().equals(bo.getWarehouseId())) {
+                                continue;
                             }
                         }
                         // 为每个planCoil创建独立的detail，携带自身的logicWarehouseId/furnaceLevel
diff --git a/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml b/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml
index 94a97fceb..49a48ae71 100644
--- a/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml
+++ b/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml
@@ -17,10 +17,6 @@
       <if test="planNo != null and planNo != ''">
         AND p.plan_no LIKE CONCAT('%', #{planNo}, '%')
       </if>
-      <!-- 出炉时的逻辑库区筛选（wms_furnace_plan_coil.logic_warehouse_id） -->
-      <if test="warehouseId != null">
-        AND pc.logic_warehouse_id = #{warehouseId}
-      </if>
     </where>
   </sql>
 
@@ -43,10 +39,6 @@
            p.end_time AS endTime
     FROM wms_furnace_plan p
     LEFT JOIN wms_furnace f ON f.furnace_id = p.target_furnace_id
-    <if test="warehouseId != null">
-    INNER JOIN wms_furnace_plan_coil pc ON pc.plan_id = p.plan_id AND pc.del_flag = 0
-    INNER JOIN wms_material_coil mc ON mc.coil_id = pc.coil_id AND mc.del_flag = 0
-    </if>
     <include refid="AnnealPerformanceWhere" />
     GROUP BY p.plan_id, p.plan_no, p.target_furnace_id, f.furnace_name, p.actual_start_time, p.end_time
     ORDER BY p.actual_start_time DESC, p.plan_no DESC