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 0d07ee5f..d56334ea 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 @@ -366,5 +366,11 @@ public class WmsMaterialCoilBo extends BaseEntity { */ @TableField(exist = false) private Boolean groupByEnterCoilNo; + + /** + * 是否按发货时间倒序排序(true=按export_time倒序) + */ + @TableField(exist = false) + private Boolean exportTimeBy; } 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 cc011675..c0da0c61 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 @@ -878,6 +878,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 按异常排序:异常的钢卷在前按创建时间倒序,没异常的钢卷在后按创建时间倒序 qw.orderByAsc("CASE WHEN COALESCE(ca.abnormal_count, 0) > 0 THEN 0 ELSE 1 END"); qw.orderByDesc("mc.create_time"); + } else if (Boolean.TRUE.equals(bo.getExportTimeBy())) { + // 按发货时间倒序排序 + qw.orderByDesc("mc.export_time"); } else { //根据创建时间倒叙 qw.orderByDesc("mc.create_time");