From ae410d85e5f7ee0ebd059ec443d4c01197c1fcd4 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 12 Mar 2026 14:29:28 +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=E6=93=8D=E4=BD=9C=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81=E5=B7=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增listPendingActionWithDeleted方法用于查询包含已删除记录的钢卷待操作列表
- 新增listDeletedPendingAction方法用于仅查询已删除的钢卷待操作列表
- 在WmsCoilPendingActionBo中添加includeDeleted字段支持三种查询模式
- 修改WmsCoilPendingActionServiceImpl实现支持includeDeleted参数的逻辑删除过滤
- 支持includeDeleted参数值为0(不包含已删除)、1(包含已删除)、2(仅查询已删除)三种模式
---
 klp-ui/src/api/wms/pendingAction.js           | 25 +++++++++++++++++++
 .../klp/domain/bo/WmsCoilPendingActionBo.java |  5 ++++
 .../impl/WmsCoilPendingActionServiceImpl.java | 17 +++++++++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/api/wms/pendingAction.js b/klp-ui/src/api/wms/pendingAction.js
index 8b2d4eaf..4fb19e7f 100644
--- a/klp-ui/src/api/wms/pendingAction.js
+++ b/klp-ui/src/api/wms/pendingAction.js
@@ -9,6 +9,31 @@ export function listPendingAction(query) {
   })
 }
 
+// 查询钢卷待操作列表(包含已删除记录)
+// includeDeleted: 0=不包含已删除(默认), 1=包含已删除记录, 2=仅查询已删除记录
+export function listPendingActionWithDeleted(query) {
+  return request({
+    url: '/wms/coilPendingAction/list',
+    method: 'get',
+    params: {
+      ...query,
+      includeDeleted: 1
+    }
+  })
+}
+
+// 仅查询已删除的钢卷待操作列表
+export function listDeletedPendingAction(query) {
+  return request({
+    url: '/wms/coilPendingAction/list',
+    method: 'get',
+    params: {
+      ...query,
+      includeDeleted: 2
+    }
+  })
+}
+
 // 查询钢卷待操作详细
 export function getPendingAction(actionId) {
   return request({
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
index 7360d6a2..02dd3376 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
@@ -109,5 +109,10 @@ public class WmsCoilPendingActionBo extends BaseEntity {
 
     //备注
     private String remark;
+
+    /**
+     * 是否包含已删除记录（0=不包含，1=包含已删除，2=仅查询已删除）
+     */
+    private Integer includeDeleted;
 }
 
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 23e200e2..776a4431 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
@@ -112,8 +112,21 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime());
         // 根据更新人查询
         qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy());
-        //逻辑删除
-        qw.eq("wcpa.del_flag", 0);
+        //逻辑删除 - 支持查询已删除记录
+        if (bo.getIncludeDeleted() != null) {
+            if (bo.getIncludeDeleted() == 1) {
+                // 包含已删除记录：不添加del_flag过滤，查询所有记录
+            } else if (bo.getIncludeDeleted() == 2) {
+                // 仅查询已删除记录
+                qw.eq("wcpa.del_flag", 1);
+            } else {
+                // 默认：仅查询正常记录
+                qw.eq("wcpa.del_flag", 0);
+            }
+        } else {
+            // 未传参数时默认仅查询正常记录
+            qw.eq("wcpa.del_flag", 0);
+        }
         return qw;
     }