diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 70265b48..afcaee15 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -66,6 +66,11 @@ public class WmsMaterialCoilBo extends BaseEntity { */ private Long nextWarehouseId; + /** + * 下一库区IDs(逗号分隔) + */ + private String nextWarehouseIds; + /** * 关联二维码ID(wms_generate_record.record_id) */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index ea33616e..032e9ee2 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -416,6 +416,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade()); // 独占状态 qw.eq(bo.getExclusiveStatus() != null, "mc.exclusive_status", bo.getExclusiveStatus()); + //逻辑删除 + qw.eq("mc.del_flag", 0); // 统一处理 warehouseId 与 warehouseIds: List warehouseIdList = new ArrayList<>(); if (bo.getWarehouseId() != null) { @@ -436,6 +438,25 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.in("mc.warehouse_id", warehouseIdList.stream().distinct().collect(Collectors.toList())); } + // 统一处理 nextWarehouseId 与 nextWarehouseIds: + List nextWarehouseIdList = new ArrayList<>(); + if (bo.getNextWarehouseId() != null) { + nextWarehouseIdList.add(bo.getNextWarehouseId()); + } + if (StringUtils.isNotBlank(bo.getNextWarehouseIds())) { + String[] nextWarehouseIdArray = bo.getNextWarehouseIds().split(","); + for (String nextWarehouseIdStr : nextWarehouseIdArray) { + if (StringUtils.isNotBlank(nextWarehouseIdStr)) { + try { + nextWarehouseIdList.add(Long.parseLong(nextWarehouseIdStr.trim())); + } catch (NumberFormatException ignore) { + } + } + } + } + if (!nextWarehouseIdList.isEmpty()) { + qw.in("mc.next_warehouse_id", nextWarehouseIdList.stream().distinct().collect(Collectors.toList())); + } // 新增长度 qw.eq(bo.getLength() != null, "mc.length", bo.getLength()); // 如果actualWarehouseId不为空,则根据实际库区ID进行查询 如果为-1,则查询无库区的数据 @@ -584,8 +605,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " + // "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))"); // } - //逻辑删除 - qw.eq("mc.del_flag", 0); //把team字段作为筛选条件 qw.eq(StringUtils.isNotBlank(bo.getTeam()), "mc.team", bo.getTeam()); //根据开始时间和结束时间筛选修改时间