From 64d1d4683b25763633492fe35e1b9f8a5824aebd Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 12 Mar 2026 17:24:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(mapper):=20=E6=B7=BB=E5=8A=A0=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=93=8D=E4=BD=9CID=E5=92=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsCoilPendingActionMapper接口中新增selectByActionIdAndDelFlag方法
- 在WmsCoilPendingActionMapper.xml中添加对应的SQL查询语句
- 修改WmsCoilPendingActionServiceImpl中的查询逻辑使用新方法
- 移除原有的QueryWrapper查询方式并导入UpdateWrapper依赖
---
 .../java/com/klp/mapper/WmsCoilPendingActionMapper.java  | 9 +++++++++
 .../service/impl/WmsCoilPendingActionServiceImpl.java    | 8 +++-----
 .../resources/mapper/klp/WmsCoilPendingActionMapper.xml  | 9 +++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java
index 2c476a9f..ea744d92 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java
@@ -24,5 +24,14 @@ public interface WmsCoilPendingActionMapper extends BaseMapperPlus<WmsCoilPendin
      * @return 更新行数
      */
     int updateDelFlag(@Param("actionId") Long actionId, @Param("delFlag") Integer delFlag);
+
+
+    /**
+     * 根据操作ID和删除标志查询记录(包含已删除记录)
+     * @param actionId 操作ID
+     * @param delFlag 删除标志(0=正常,1=已删除)
+     * @return 待操作记录
+     */
+    WmsCoilPendingAction selectByActionIdAndDelFlag(@Param("actionId") Long actionId, @Param("delFlag") Integer delFlag);
 }
 
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
index f9f78de0..e67fad85 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
@@ -3,6 +3,7 @@ package com.klp.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.common.core.domain.PageQuery;
@@ -292,11 +293,8 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
             throw new ServiceException("操作ID不能为空");
         }
 
-        // 使用QueryWrapper查询，不受逻辑删除影响，检查记录是否存在且del_flag为1(已删除)
-        WmsCoilPendingAction oldAction = baseMapper.selectOne(new QueryWrapper<WmsCoilPendingAction>()
-            .eq("action_id", actionId)
-            .eq("del_flag", 2)
-            .last("LIMIT 1"));
+        // 使用自定义查询方法检查记录是否存在且del_flag为1(已删除)
+        WmsCoilPendingAction oldAction = baseMapper.selectByActionIdAndDelFlag(actionId, 2);
         if (oldAction == null) {
             throw new ServiceException("待操作记录不存在或未被删除");
         }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
index 6bc5afc5..83d70905 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
@@ -88,6 +88,15 @@
         ${ew.customSqlSegment}
     </select>
 
+    <!-- 根据操作ID和删除标志查询记录(包含已删除记录) -->
+    <select id="selectByActionIdAndDelFlag" resultType="com.klp.domain.WmsCoilPendingAction">
+        SELECT *
+        FROM wms_coil_pending_action
+        WHERE action_id = #{actionId}
+          AND del_flag = #{delFlag}
+            LIMIT 1
+    </select>
+
     <!-- 更新删除标志(绕过@TableLogic注解限制) -->
     <update id="updateDelFlag">
         UPDATE wms_coil_pending_action