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 0bd3640e..9846537f 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 @@ -197,5 +197,12 @@ public class WmsMaterialCoilBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date byCreateTimeEnd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date byExportTimeStart; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date byExportTimeEnd; } 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 f21ac41a..119fcf97 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 @@ -1914,6 +1914,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { lqw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime()); lqw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime()); + // 根据发货开始和结束筛选发货时间 + lqw.ge(bo.getByExportTimeStart() != null, "mc.export_time", bo.getByExportTimeStart()); + lqw.le(bo.getByExportTimeEnd() != null, "mc.export_time", bo.getByExportTimeEnd()); // 逻辑删除 lqw.eq("mc.del_flag", 0);