feat(wms): 排产计划增加计划开始日期和结束日期字段
- 在 WmsSchedulePlan 和 WmsSchedulePlanBo 类中添加 startDate 和 endDate 字段 - 更新相关服务方法,支持新增的计划开始日期和结束日期功能 - 注释掉查询排产计划总的开始结束时间的代码块
This commit is contained in:
@@ -1,10 +1,13 @@
|
|||||||
package com.klp.domain;
|
package com.klp.domain;
|
||||||
|
|
||||||
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.klp.common.core.domain.BaseEntity;
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排产计划对象 wms_schedule_plan
|
* 排产计划对象 wms_schedule_plan
|
||||||
@@ -60,4 +63,13 @@ public class WmsSchedulePlan extends BaseEntity {
|
|||||||
// * 工艺路线
|
// * 工艺路线
|
||||||
// */
|
// */
|
||||||
// private String processRoute;
|
// private String processRoute;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 计划开始日期
|
||||||
|
*/
|
||||||
|
private Date startDate;
|
||||||
|
/**
|
||||||
|
* 计划结束日期
|
||||||
|
*/
|
||||||
|
private Date endDate;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
package com.klp.domain.bo;
|
package com.klp.domain.bo;
|
||||||
|
|
||||||
|
import com.alibaba.excel.annotation.format.DateTimeFormat;
|
||||||
import com.klp.common.core.domain.BaseEntity;
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import javax.validation.constraints.*;
|
import javax.validation.constraints.*;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -52,6 +54,18 @@ public class WmsSchedulePlanBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long priority;
|
private Long priority;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 计划开始日期
|
||||||
|
*/
|
||||||
|
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date startDate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 计划结束日期
|
||||||
|
*/
|
||||||
|
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date endDate;
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
// * 工艺路线
|
// * 工艺路线
|
||||||
// */
|
// */
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class WmsSchedulePlanServiceImpl implements IWmsSchedulePlanService {
|
|||||||
public TableDataInfo<WmsSchedulePlanVo> queryPageList(WmsSchedulePlanBo bo, PageQuery pageQuery) {
|
public TableDataInfo<WmsSchedulePlanVo> queryPageList(WmsSchedulePlanBo bo, PageQuery pageQuery) {
|
||||||
LambdaQueryWrapper<WmsSchedulePlan> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<WmsSchedulePlan> lqw = buildQueryWrapper(bo);
|
||||||
Page<WmsSchedulePlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
Page<WmsSchedulePlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
// 查排产计划总的开始结束时间
|
/*// 查排产计划总的开始结束时间
|
||||||
// 获取所有planId
|
// 获取所有planId
|
||||||
List<Long> planIds = result.getRecords().stream()
|
List<Long> planIds = result.getRecords().stream()
|
||||||
.map(WmsSchedulePlanVo::getPlanId)
|
.map(WmsSchedulePlanVo::getPlanId)
|
||||||
@@ -72,7 +72,7 @@ public class WmsSchedulePlanServiceImpl implements IWmsSchedulePlanService {
|
|||||||
vo.setEndDate(agg.getEndDate());
|
vo.setEndDate(agg.getEndDate());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
return TableDataInfo.build(result);
|
return TableDataInfo.build(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user