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