From 890c6dd01dc687f52edfa946bb1beddf6e46468e Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 24 Mar 2026 14:21:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=B1=BB=E5=9E=8B=E5=A4=9A=E9=80=89=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsCoilPendingActionBo 中新增 actionTypes 字段支持多选
- 修改查询逻辑以支持单个操作类型或多个操作类型的筛选条件
- 使用 in 条件查询实现多选筛选功能
- 保持原有单选功能的兼容性
- 更新 Lambda 查询方式下的多选逻辑处理
---
 .../com/klp/domain/bo/WmsCoilPendingActionBo.java    |  6 ++++++
 .../impl/WmsCoilPendingActionServiceImpl.java        | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

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 a13b7ff6..c9fae5ac 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
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 import java.util.Date;
+import java.util.List;
 import com.klp.common.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -45,6 +46,11 @@ public class WmsCoilPendingActionBo extends BaseEntity {
     @NotNull(message = "操作类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer actionType;
 
+    /**
+     * 操作类型集合（用于多选筛选）
+     */
+    private List<Integer> actionTypes;
+
     /**
      * 操作状态（0=待处理，1=处理中，2=已完成，3=已取消）
      */
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 cc68884a..df7edba2 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
@@ -96,7 +96,11 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         QueryWrapper<WmsCoilPendingAction> qw = Wrappers.query();
         qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId());
         qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo());
-        qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
+        if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) {
+            qw.in("wcpa.action_type", bo.getActionTypes());
+        } else {
+            qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
+        }
         if (bo.getActionStatus() != null) {
             if (bo.getActionStatus() == -1) {
                 qw.ne("wcpa.action_status", 2);
@@ -147,7 +151,11 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         LambdaQueryWrapper<WmsCoilPendingAction> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getCoilId() != null, WmsCoilPendingAction::getCoilId, bo.getCoilId());
         lqw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), WmsCoilPendingAction::getCurrentCoilNo, bo.getCurrentCoilNo());
-        lqw.eq(bo.getActionType() != null, WmsCoilPendingAction::getActionType, bo.getActionType());
+        if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) {
+            lqw.in(WmsCoilPendingAction::getActionType, bo.getActionTypes());
+        } else {
+            lqw.eq(bo.getActionType() != null, WmsCoilPendingAction::getActionType, bo.getActionType());
+        }
         lqw.eq(bo.getActionStatus() != null, WmsCoilPendingAction::getActionStatus, bo.getActionStatus());
         lqw.eq(bo.getWarehouseId() != null, WmsCoilPendingAction::getWarehouseId, bo.getWarehouseId());
         lqw.eq(bo.getPriority() != null, WmsCoilPendingAction::getPriority, bo.getPriority());