feat(wms): 添加操作类型多选筛选功能
- 在 WmsCoilPendingActionBo 中新增 actionTypes 字段支持多选 - 修改查询逻辑以支持单个操作类型或多个操作类型的筛选条件 - 使用 in 条件查询实现多选筛选功能 - 保持原有单选功能的兼容性 - 更新 Lambda 查询方式下的多选逻辑处理
This commit is contained in:
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user