完成最大间隔限制问题。

yun-zuoyi
钮海涛 4 years ago
parent e48341f47b
commit 9910420ea8

@ -26,4 +26,8 @@ public class CancelPlanRule extends BaseRule {
@Column(name="WORK_FILTERS")
@ApiParam(value ="工作筛选")
private String workFilters;
@Column(name="RECORD_RIGHT_EDGE")
@ApiParam(value ="记录工作右边界")
private Boolean recordRightEdge;
}

@ -52,4 +52,8 @@ public class HeuristicOptimize extends BaseRule {
@Column(name="OPTIMIZE_INTERVAL")
@ApiParam(value ="优化间隔")
private String optimizeInterval;
@Column(name="MAX_WAITING_LIMIT")
@ApiParam(value ="最大等待时间限制")
private Boolean maxWaitingLimit;
}

@ -68,6 +68,11 @@ public class StandOperation extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String minSpaceTime;
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大时间间隔")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxSpaceTime;
@Column(name="COMB_TYPE")
@ApiParam(value ="生产组合方式")
@FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

@ -166,14 +166,20 @@ public class Work extends BaseAPS {
@ApiParam(value ="动态拆分工作ID")
private Long originWorkId;
@ApiParam(value ="工作左边界")
private Date leftEdge;
@ApiParam(value ="工作右边界")
private Date rightEdge;
@ApiParam(value ="工作排序顺序")
private Integer workSeqNumber;
// 排程时,找插入位置的评估值
private transient double evaluateValue = 0;
private transient boolean hasOptimized = false;
// 排程时确定工作是正向排程还是逆向排程。
private transient boolean positive = true;
public BaseOrder getOrder() {

@ -124,6 +124,12 @@ public class WorkPlan extends BaseAPS {
@ApiParam(value ="是否组炉")
private Boolean hasCominbed = false;
@ApiParam(value ="资源生产开始")
@FieldAnnotation(display = false)
@Transient
@RippleAnnotation(dependence = {"PrevPlan.resProduceBegin"}, method = "calcPositive")
private Date resProduceBegin;
@ApiParam(value ="资源生产结束")
@FieldAnnotation(display = false)
@Transient

Loading…
Cancel
Save