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 c9fae5ac..ef74a95c 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 @@ -123,5 +123,8 @@ public class WmsCoilPendingActionBo extends BaseEntity { // 加工后的钢卷ids private String processedCoilIds; + + // 钢卷ID列表(逗号分隔) + private String coilIds; } 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 1e503d66..a0bc4908 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,6 +96,15 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer private QueryWrapper buildQueryWrapperPlus(WmsCoilPendingActionBo bo) { QueryWrapper qw = Wrappers.query(); qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId()); + if (StringUtils.isNotBlank(bo.getCoilIds())) { + List coilIdList = Arrays.stream(bo.getCoilIds().split(",")) + .filter(StringUtils::isNotBlank) + .map(Long::parseLong) + .collect(Collectors.toList()); + if (!coilIdList.isEmpty()) { + qw.in("wcpa.coil_id", coilIdList); + } + } qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo()); if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) { qw.in("wcpa.action_type", bo.getActionTypes());