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 084f0719..382497c4 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 @@ -214,6 +214,11 @@ public class WmsMaterialCoilBo extends BaseEntity { */ private Boolean excludeBound; + /** + * 是否排除已打包的钢卷(true=列表不返回已打包钢卷) + */ + private Boolean excludePacked; + /** * 是否在列表中返回“发货单明细绑定信息”(true=返回 bound + 绑定来源信息) * 默认不返回,避免不需要的场景变慢。 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 969276a4..21f8f588 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 @@ -533,6 +533,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_waybill_detail d WHERE d.del_flag = 0 AND d.coil_id = mc.coil_id)"); } + // 排除已打包的钢卷(防止重复打包) + if (Boolean.TRUE.equals(bo.getExcludePacked())) { + qw.apply("NOT EXISTS (SELECT 1 FROM wms_coil_packing_detail pd WHERE pd.del_flag = 0 AND pd.coil_id = mc.coil_id)"); + } + // 组合 item_id 条件:改为使用 EXISTS 子查询,替代预查询 + IN boolean hasSelectType = StringUtils.isNotBlank(bo.getSelectType()); boolean hasAnyItemFilter = StringUtils.isNotBlank(bo.getItemMaterial())