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 b3493bbe..41aae277 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 @@ -122,5 +122,7 @@ public class WmsMaterialCoilBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; + private String itemIds; + } 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 c4300174..8a8477b0 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 @@ -152,7 +152,26 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit()); qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus()); qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); - qw.eq(bo.getItemId() !=null, "mc.item_id", bo.getItemId()); + // 修改itemId筛选逻辑,支持逗号分隔的多个ID查询 + if (StringUtils.isNotBlank(bo.getItemIds())) { + String[] itemIdArray = bo.getItemIds().split(","); + List itemIdList = new ArrayList<>(); + for (String itemIdStr : itemIdArray) { + if (StringUtils.isNotBlank(itemIdStr)) { + try { + itemIdList.add(Long.parseLong(itemIdStr.trim())); + } catch (NumberFormatException e) { + // 忽略无效的ID格式 + } + } + } + if (!itemIdList.isEmpty()) { + qw.in("mc.item_id", itemIdList); + } + } else if (bo.getItemId() != null) { + // 兼容原来的itemId单值查询 + qw.eq("mc.item_id", bo.getItemId()); + } //逻辑删除 qw.eq("mc.del_flag", 0); //把team字段作为筛选条件