增加基准时间间隔功能。

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

@@ -64,4 +64,9 @@ public class FurnacePlan extends BaseAPS {
         this.mergePlanId = plan != null ? plan.getId() : 0L;
         BeanRelation.set(this, EFurnacePlan.MergePlan, plan);
     }
+
+    @JsonBackReference
+    public FurnacePlan getOriginMergePlan() {
+        return BeanRelation.get(this, EFurnacePlan.OriginMergePlan);
+    }
 }

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

@@ -73,6 +73,12 @@ public class StandOperation extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxSpaceTime;
 
+    @Column(name="FLUSH_TIME_BLOCK")
+    @ApiParam(value ="刷新时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    // 刷新计划时将一天时间按块分割，后工作在本工作的下一时间块中排程。
+    private String flushTimeBlock;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

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

@@ -3,4 +3,5 @@ package cn.estsh.i3plus.pojo.aps.holders;
 public enum EFurnacePlan {
     WorkPlans,
     MergePlan,
+    OriginMergePlan,
 }

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

@@ -2,6 +2,6 @@
 <Class name="FurnacePlan">
     <Relation field="WorkPlans" name="WorkPlan" reverse="FurnacePlan" type="ONE_TO_MULTI" owner="true">
     </Relation>
-    <Relation field="MergePlan" name="FurnacePlan" type="MULTI_TO_ONE" owner="false">
+    <Relation field="MergePlan" name="FurnacePlan" reverse="OriginMergePlan" type="ONE_TO_ONE" owner="false">
     </Relation>
 </Class>