From f6ea637c29aa7b6715cd496485a1d0dbc5e9ab7f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 17 Dec 2025 14:32:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(sql):=20=E4=BC=98=E5=8C=96coil=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用ROW_NUMBER窗口函数替代子查询和JOIN操作
- 简化查询结构，提高执行效率
- 保留对coilIds的可选过滤条件
- 确保每个coilId只返回最新的记录
---
 .../klp/WmsDeliveryPlanCoilOperateMapper.xml  | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml
index decae65c..3ce9a1fd 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml
@@ -17,28 +17,20 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
     <select id="getCoilOperate" resultMap="WmsDeliveryPlanCoilOperateResult">
-        SELECT t.*
-        FROM wms_delivery_plan_coil_operate t
-        INNER JOIN (
-        -- 子查询：先获取每个coilId的最新创建时间（限定planId和coilIds）
+        SELECT * FROM (
         SELECT
-        coil_id,
-        MAX(create_time) AS max_create_time
-        FROM wms_delivery_plan_coil_operate
+        t.*,
+        ROW_NUMBER() OVER (PARTITION BY t.coil_id ORDER BY t.create_time DESC) AS rn
+        FROM wms_delivery_plan_coil_operate t
         WHERE plan_id = #{planId}
-        AND coil_id IN
-        <foreach collection="coilIds" item="coilId" open="(" separator="," close=")">
-            #{coilId}
-        </foreach>
-        GROUP BY coil_id
-        ) t_max ON t.plan_id = #{planId}
-        AND t.coil_id = t_max.coil_id
-        AND t.create_time = t_max.max_create_time
-        -- 最终过滤目标coilIds（双重保障）
-        WHERE t.coil_id IN
-        <foreach collection="coilIds" item="coilId" open="(" separator="," close=")">
-            #{coilId}
-        </foreach>
+        <if test="coilIds != null and coilIds.length > 0">
+            AND coil_id IN
+            <foreach collection="coilIds" item="coilId" open="(" separator="," close=")">
+                #{coilId}
+            </foreach>
+        </if>
+        ) tmp
+        WHERE tmp.rn = 1
     </select>
 
 

From 62f64b390216f9aa31e3c13dcd802345385cfa47 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 17 Dec 2025 14:35:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(wms):=20=E6=89=A9=E5=B1=95WMS=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E9=92=A2=E5=8D=B7=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?VO=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 继承BaseEntity以支持基础实体功能
- 添加序列化版本UID以确保序列化兼容性
- 引入必要的依赖包以支持扩展功能
---
 .../java/com/klp/domain/vo/WmsDeliveryPlanCoilOperateVo.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanCoilOperateVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanCoilOperateVo.java
index 393230b7..374b5b67 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanCoilOperateVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanCoilOperateVo.java
@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.util.List;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsDeliveryPlanCoilOperateVo {
+public class WmsDeliveryPlanCoilOperateVo  extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

From 487dc025b0369e56856f4e14029615f342b7b917 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 17 Dec 2025 15:02:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(wms):=20=E5=8F=91=E8=B4=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=92=A2=E5=8D=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在XML映射文件中添加coilIds空值判断，防止SQL异常
- 将materialCoilService声明为final，确保依赖不可变性
- 优化查询条件，当coilIds为空时返回空结果集
- 提高代码健壮性和查询安全性
---
 .../service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java    | 2 +-
 .../resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java
index 38916d4e..065aa89e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java
@@ -32,7 +32,7 @@ public class WmsDeliveryPlanCoilOperateServiceImpl implements IWmsDeliveryPlanCo
 
     private final WmsDeliveryPlanCoilOperateMapper baseMapper;
 
-    private WmsMaterialCoilServiceImpl materialCoilService;
+    private final WmsMaterialCoilServiceImpl materialCoilService;
 
     /**
      * 查询发货计划钢卷操作记录
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml
index 3ce9a1fd..6ef499e9 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanCoilOperateMapper.xml
@@ -31,6 +31,9 @@
         </if>
         ) tmp
         WHERE tmp.rn = 1
+        <if test="coilIds == null or coilIds.length == 0">
+            AND 1 = 2
+        </if>
     </select>