diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java index de3cbd07..6f8b92f0 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java @@ -105,5 +105,17 @@ public class WmsMaterialWarningBo extends BaseEntity { */ private String remark; + /** + * 创建开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createStartTime; + + /** + * 创建结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createEndTime; + } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java index 8d99183e..77b60f97 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java @@ -106,6 +106,8 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService lqw.eq(StringUtils.isNotBlank(bo.getHandleBy()), WmsMaterialWarning::getHandleBy, bo.getHandleBy()); lqw.eq(bo.getHandleTime() != null, WmsMaterialWarning::getHandleTime, bo.getHandleTime()); lqw.eq(StringUtils.isNotBlank(bo.getHandleRemark()), WmsMaterialWarning::getHandleRemark, bo.getHandleRemark()); + lqw.ge(bo.getCreateStartTime() != null, WmsMaterialWarning::getCreateTime, bo.getCreateStartTime()); + lqw.le(bo.getCreateEndTime() != null, WmsMaterialWarning::getCreateTime, bo.getCreateEndTime()); // 根据创建时间倒叙 lqw.orderByDesc(WmsMaterialWarning::getCreateTime); return lqw;