diff --git a/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java b/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java index b142c04c..85aec8e0 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java @@ -1,10 +1,13 @@ package com.klp.domain; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 排产计划对象 wms_schedule_plan @@ -60,4 +63,13 @@ public class WmsSchedulePlan extends BaseEntity { // * 工艺路线 // */ // private String processRoute; + + /** + * 计划开始日期 + */ + private Date startDate; + /** + * 计划结束日期 + */ + private Date endDate; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java index 44eaacd3..afd06c38 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java @@ -1,9 +1,11 @@ package com.klp.domain.bo; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; +import java.util.Date; /** @@ -52,6 +54,18 @@ public class WmsSchedulePlanBo extends BaseEntity { */ private Long priority; + /** + * 计划开始日期 + */ + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date startDate; + + /** + * 计划结束日期 + */ + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date endDate; + // /** // * 工艺路线 // */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java index 9a07ebb3..50574923 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java @@ -54,7 +54,7 @@ public class WmsSchedulePlanServiceImpl implements IWmsSchedulePlanService { public TableDataInfo queryPageList(WmsSchedulePlanBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - // 查排产计划总的开始结束时间 + /*// 查排产计划总的开始结束时间 // 获取所有planId List planIds = result.getRecords().stream() .map(WmsSchedulePlanVo::getPlanId) @@ -72,7 +72,7 @@ public class WmsSchedulePlanServiceImpl implements IWmsSchedulePlanService { vo.setEndDate(agg.getEndDate()); } } - } + }*/ return TableDataInfo.build(result); }