From a83a8147a41a759c296aef1710199495c5f9a170 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 11 Jul 2026 17:57:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(service):=20=E6=9B=B4=E6=96=B0=E9=80=80?=
 =?UTF-8?q?=E7=81=AB=E6=80=A7=E8=83=BD=E6=9C=8D=E5=8A=A1=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 IWmsAnnealPerformanceService 接口中添加 WmsMaterialCoilBo 参数
- 修改 queryPlanCoils 方法签名以支持额外的筛选条件
- 更新控制器 WmsAnnealPerformanceController 中的 getRawCoils 方法参数
- 实现类 WmsAnnealPerformanceServiceImpl 中相应调整方法实现
- 钢卷查询逻辑从硬编码改为通过 coilBo 传入筛选条件
---
 .../com/klp/controller/WmsAnnealPerformanceController.java   | 5 +++--
 .../java/com/klp/service/IWmsAnnealPerformanceService.java   | 3 ++-
 .../klp/service/impl/WmsAnnealPerformanceServiceImpl.java    | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java b/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java
index c13628186..b04b7408e 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java
@@ -2,6 +2,7 @@ package com.klp.controller;
 
 import com.klp.common.core.domain.R;
 import com.klp.domain.bo.WmsAnnealPerformanceBo;
+import com.klp.domain.bo.WmsMaterialCoilBo;
 import com.klp.domain.vo.WmsMaterialCoilVo;
 import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo;
 import com.klp.service.IWmsAnnealPerformanceService;
@@ -36,7 +37,7 @@ public class WmsAnnealPerformanceController {
      * 查询退火计划中的加工前钢卷列表
      */
     @GetMapping("/rawCoils")
-    public R<List<WmsMaterialCoilVo>> getRawCoils(WmsAnnealPerformanceBo bo) {
-        return R.ok(performanceService.queryPlanCoils(bo));
+    public R<List<WmsMaterialCoilVo>> getRawCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) {
+        return R.ok(performanceService.queryPlanCoils(bo, coilBo));
     }
 }
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java b/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java
index 61890b130..6e08554db 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java
@@ -1,6 +1,7 @@
 package com.klp.service;
 
 import com.klp.domain.bo.WmsAnnealPerformanceBo;
+import com.klp.domain.bo.WmsMaterialCoilBo;
 import com.klp.domain.vo.WmsMaterialCoilVo;
 import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo;
 
@@ -19,5 +20,5 @@ public interface IWmsAnnealPerformanceService {
     /**
      * 查询退火计划中的加工前钢卷列表
      */
-    List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo);
+    List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo);
 }
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 4544a10b7..e7356aefe 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
@@ -204,7 +204,7 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
     }
 
     @Override
-    public List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo) {
+    public List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) {
         // 1. 查询退火计划
         LambdaQueryWrapper<WmsFurnacePlan> planQw = new LambdaQueryWrapper<WmsFurnacePlan>()
             .ge(bo.getStartTime() != null, WmsFurnacePlan::getActualStartTime, bo.getStartTime())
@@ -236,8 +236,7 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
             return Collections.emptyList();
         }
 
-        // 3. 按coilId直接查询加工前的钢卷
-        WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
+        // 3. 按coilId查询加工前的钢卷，筛选条件由coilBo带入
         coilBo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
         PageQuery pageQuery = new PageQuery();
         pageQuery.setPageNum(1);