工序间最大间隔限制调整前

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java

@@ -56,4 +56,8 @@ public class HeuristicOptimize extends BaseRule {
     @Column(name="MAX_WAITING_LIMIT")
     @ApiParam(value ="最大等待时间限制")
     private Boolean maxWaitingLimit;
+
+    @Column(name="MAX_WAITING_ADJUST")
+    @ApiParam(value ="最大等待时间调整")
+    private Boolean maxWaitingAdjust;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java

@@ -18,6 +18,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -127,6 +128,8 @@ public class Resource extends BaseAPS {
     @Transient
     private boolean hasConflict;
 
+    private transient Date rightLimit;
+
     public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -152,6 +152,11 @@ public class Work extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operationId;
 
+    @Column(name="ORIGIN_OPERATION_ID")
+    @ApiParam(value ="原始工序")
+    @FieldAnnotation(property = false)
+    private Long originOperationId;
+
     @Column(name="PARENT_WORK_ID")
     @ApiParam(value ="父工作")
     @FieldAnnotation(property = false)
@@ -200,6 +205,15 @@ public class Work extends BaseAPS {
         BeanRelation.set(this, EWork.Operation, oper);
     }
 
+    public Operation getOriginOperation() {
+        return BeanRelation.get(this, EWork.OriginOperation);
+    }
+
+    public void setOriginOperation(Operation oper) {
+        this.originOperationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EWork.OriginOperation, oper);
+    }
+
     public ParentWork getParentWork() {
         return BeanRelation.get(this, EWork.ParentWork);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java

@@ -9,6 +9,7 @@ public enum EWork {
     PrevRelations,  // 前关联
     PostRelations,  // 后关联
     Operation,      // 工序
+    OriginOperation,    // 原始工序
     PlanFeedback,  // 工作计划反馈
     MainPlan,    // 关联的为主资源的计划
     WorkPlans,   // 关联的工作计划

modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml

@@ -12,6 +12,8 @@
     </Relation>
     <Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
     </Relation>
+    <Relation field="OriginOperation" name="Operation" type="MULTI_TO_ONE" owner="false">
+    </Relation>
     <Relation field="MainPlan" name="WorkPlan" reverse="MainWork" type="ONE_TO_ONE">
     </Relation>
     <Relation field="WorkPlans" name="WorkPlan" reverse="Work" type="ONE_TO_MULTI" owner="true">

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -334,7 +334,7 @@ public class ApsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RESOURCE_CLASS {
         LIMITLESS("LIMITLESS", "无限能力"),
-        SINGLE("SINGLE", "单能力"),
+        SINGLE("SINGLE", "单资源"),
         BATCH("BATCH", "炉资源");
 
         private String value;
@@ -770,7 +770,7 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_TYPE {
-        // 工作不参与排程
+        // 工作不参与排程，比如销售订单的工作
         FICTITIOUS("FICTITIOUS", "虚拟工作"),
         // 动态虚拟工作为不计算生产时间。
         DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"),