From b4bd96147f77b3556692f1947ce7bc6176002b90 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 24 Apr 2026 10:46:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E5=BE=85=E5=A4=84=E7=90=86=E5=8A=A8=E4=BD=9C=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=90=8EID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsCoilPendingActionIdCoilVo中新增processedCoilIds字段
- 更新WmsCoilPendingActionMapper.xml查询语句以包含processed_coil_ids
- 从WmsMaterialCoilAnnealExportVo中移除目标炉子ID的Excel导出映射
---
 .../java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java  | 4 ++++
 .../java/com/klp/domain/vo/WmsMaterialCoilAnnealExportVo.java | 1 -
 .../main/resources/mapper/klp/WmsCoilPendingActionMapper.xml  | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java
index 133a4a61..3d596dcd 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionIdCoilVo.java
@@ -21,5 +21,9 @@ public class WmsCoilPendingActionIdCoilVo implements Serializable {
      * 对应的钢卷ID
      */
     private Long coilId;
+
+
+    // processedCoilIds 加工后的ids
+    private String processedCoilIds;
 }
 
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAnnealExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAnnealExportVo.java
index 44631ed6..f492c3f4 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAnnealExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAnnealExportVo.java
@@ -26,7 +26,6 @@ public class WmsMaterialCoilAnnealExportVo extends WmsMaterialCoilExportVo {
     @ExcelProperty(value = "结束时间")
     private Date endTime;
 
-    @ExcelProperty(value = "目标炉子ID")
     private Long targetFurnaceId;
 
     @ExcelProperty(value = "目标炉子名称")
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
index 71c2945c..00639cf8 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
@@ -94,7 +94,8 @@
     <select id="selectActionIdCoilIdList" resultType="com.klp.domain.vo.WmsCoilPendingActionIdCoilVo">
         select
             wcpa.action_id as actionId,
-            wcpa.coil_id as coilId
+            wcpa.coil_id as coilId,
+            wcpa.processed_coil_ids as processedCoilIds
         from wms_coil_pending_action wcpa
         ${ew.customSqlSegment}
     </select>