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 31e81007..0d07ee5f 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 @@ -360,5 +360,11 @@ public class WmsMaterialCoilBo extends BaseEntity { */ @TableField(exist = false) private Boolean hasTransferType; + + /** + * 是否按入场钢卷号分组(true=按enter_coil_no分组) + */ + @TableField(exist = false) + private Boolean groupByEnterCoilNo; } 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 e9c34793..3f4bd813 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 @@ -881,6 +881,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { //根据创建时间倒叙 qw.orderByDesc("mc.create_time"); } + // 按入场钢卷号分组 + if (Boolean.TRUE.equals(bo.getGroupByEnterCoilNo())) { + qw.groupBy("mc.enter_coil_no"); + } return qw; }