更改左边界计算逻辑:后道工序满模即可开始。

yun-zuoyi
钮海涛 4 years ago
parent 3dd67766b2
commit 4088a85a5c

@ -160,14 +160,13 @@ public class Work extends BaseAPS {
@FieldAnnotation(property = false)
private Long mainPlanId;
// @Column(name="DYN_SPLIT_WORK_ID")
// @ApiParam(value ="动态拆分的工作ID")
// private Long dynSplitWorkId;
@Column(name="ORIGIN_WORK_ID")
@ApiParam(value ="动态拆分工作ID")
private Long originWorkId;
// 排程时,找插入位置的评估值
private transient double evaluateValue = 0;
private transient boolean hasOptimized = false;
public BaseOrder getOrder() {

@ -77,6 +77,8 @@ public class WorkPlan extends BaseAPS {
@Column(name="PRODUCE_END")
@ApiParam(value ="生产结束时间")
@FieldAnnotation(modify = false)
@RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd",
"PostPlan.produceEnd"}, method = "calcReverse")
private Date produceEnd;
@Column(name="PRODUCE_TIME")

@ -769,8 +769,11 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_TYPE {
// 工作不参与排程
FICTITIOUS("FICTITIOUS", "虚拟工作"),
// 动态虚拟工作为不计算生产时间。
DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"),
// 此工作参与排程
NORMAL("NORMAL", "普通工作");
private String value;

Loading…
Cancel
Save