DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 添加操作类型多选筛选功能

Browse Source 
- 在 WmsCoilPendingActionBo 中新增 actionTypes 字段支持多选
- 修改查询逻辑以支持单个操作类型或多个操作类型的筛选条件
- 使用 in 条件查询实现多选筛选功能
- 保持原有单选功能的兼容性
- 更新 Lambda 查询方式下的多选逻辑处理
This commit is contained in:
Joshi
2026-03-24 14:21:28 +08:00
parent cbc4334db9
commit 890c6dd01d
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
View File

@@ -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=已取消）
*/

12
klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
View File

@@ -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());