From 9910420ea8cd0a2414f002b970fb0a2cdc8163a1 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Mon, 12 Jul 2021 15:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9C=80=E5=A4=A7=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java   | 4 ++++
 .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java     | 4 ++++
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java   | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java         | 8 +++++++-
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java     | 6 ++++++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java
index 5dc8c0c..f4f3b4d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java
index c95f55d..7e820e8 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java
@@ -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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
index 7fce6f7..3235ae8 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@@ -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")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 1008891..7623752 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -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() {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index 4e7cb39..2ff8c15 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -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