From 43ace2f91e18d3c354fc57418eee9c4a3355c3f6 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 27 Apr 2026 13:00:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsAnnealPerformance):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E9=92=A2=E5=8D=B7=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=BA=93=E5=8C=BAID=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsAnnealPerformanceBo中新增currentCoilNo和warehouseId字段
- 在Mapper XML中添加currentCoilNo和warehouseId的查询条件
- 修改JOIN条件以支持多字段筛选
- 在服务实现中添加对新字段的筛选逻辑
- 更新注释内容以反映新的筛选条件
---
 .../com/klp/domain/bo/WmsAnnealPerformanceBo.java  |  9 +++++++++
 .../impl/WmsAnnealPerformanceServiceImpl.java      | 14 +++++++++++++-
 .../mapper/WmsAnnealPerformanceMapper.xml          |  9 ++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPerformanceBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPerformanceBo.java
index 8fe83675..f2e94362 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPerformanceBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPerformanceBo.java
@@ -23,9 +23,18 @@ public class WmsAnnealPerformanceBo {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+    // 目标库区id
     private Long targetFurnaceId;
 
+    // 计划号
     private String planNo;
 
+    // 入场钢卷号
     private String enterCoilNo;
+
+    // 当前钢卷号
+    private String currentCoilNo;
+
+    // 逻辑库区id
+    private Long warehouseId;
 }
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 2a869c1c..e1fcaa20 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
@@ -140,13 +140,25 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
                         // 设置炉火层级
                         coilVo.setFurnaceLevel(planCoil.getFurnaceLevel());
 
-                        // 如果传入了enterCoilNo筛选条件，只保留匹配的钢卷
+                        // 如果传入了筛选条件，只保留匹配的钢卷
                         if (bo.getEnterCoilNo() != null && !bo.getEnterCoilNo().isEmpty()) {
                             if (coilVo.getEnterCoilNo() == null ||
                                 !coilVo.getEnterCoilNo().contains(bo.getEnterCoilNo())) {
                                 continue; // 跳过不匹配的钢卷
                             }
                         }
+                        if (bo.getCurrentCoilNo() != null && !bo.getCurrentCoilNo().isEmpty()) {
+                            if (coilVo.getCurrentCoilNo() == null ||
+                                !coilVo.getCurrentCoilNo().contains(bo.getCurrentCoilNo())) {
+                                continue; // 跳过不匹配的钢卷
+                            }
+                        }
+                        if (bo.getWarehouseId() != null) {
+                            if (coilVo.getWarehouseId() == null ||
+                                !coilVo.getWarehouseId().equals(bo.getWarehouseId())) {
+                                continue; // 跳过不匹配的钢卷
+                            }
+                        }
 
                         coilVos.add(coilVo);
                     }
diff --git a/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml b/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml
index cde34ddf..fea6bdbf 100644
--- a/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml
+++ b/klp-wms/src/main/resources/mapper/WmsAnnealPerformanceMapper.xml
@@ -20,6 +20,13 @@
       <if test="enterCoilNo != null and enterCoilNo != ''">
         AND mc.enter_coil_no LIKE CONCAT('%', #{enterCoilNo}, '%')
       </if>
+      <!-- 当前钢卷号和逻辑库区id匹配 -->
+      <if test="currentCoilNo != null and currentCoilNo != ''">
+        AND mc.current_coil_no LIKE CONCAT('%', #{currentCoilNo}, '%')
+      </if>
+      <if test="warehouseId != null">
+        AND mc.warehouse_id = #{warehouseId}
+      </if>
     </where>
   </sql>
 
@@ -42,7 +49,7 @@
            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="enterCoilNo != null and enterCoilNo != ''">
+    <if test="enterCoilNo != null and enterCoilNo != '' or currentCoilNo != null and currentCoilNo != '' or 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>