From c43eba89f33a804eef55c89e9e502ed86bba3100 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 22 Jun 2021 09:00:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E5=8A=9B=E5=A3=AB?=
 =?UTF-8?q?=E6=8D=A2=E6=A8=A1=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java    | 5 +++++
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java   | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java   | 9 +++++----
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 4 ----
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java        | 2 ++
 5 files changed, 16 insertions(+), 8 deletions(-)

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 a8db480..5c06333 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
@@ -31,6 +31,11 @@ public class HeuristicOptimize extends BaseRule {
     @ApiParam(value ="工作筛选")
     private String workFilter;
 
+    @Lob
+    @Column(name="WORK_SORT")
+    @ApiParam(value ="工作排序")
+    private String workSort;
+
     @Column(name="RES_FILTER")
     @ApiParam(value ="资源筛选")
     private String resFilter;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
index a4091af..cdadeb0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
@@ -58,6 +58,10 @@ public class HeuristicRule extends BaseRule {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String batchPeriod;
 
+    @Column(name="WORK_GROUP_INTERVAL")
+    @ApiParam(value ="工作分组间隔")
+    private String workGroupInterval;
+
     @Column(name="REVER_FLUSH_PLAN")
     @ApiParam(value ="逆向刷新计划")
     private Boolean reverFlushPlan = false;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
index 2c0ea75..25594d0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
@@ -46,10 +46,10 @@ public class Inventory extends BaseOrder {
     @FieldAnnotation(modify = false)
     private Double assignCount;
 
-    @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="多余量")
-    @FieldAnnotation(modify = false)
-    private Double excessCount;
+//    @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
+//    @ApiParam(value ="多余量")
+//    @FieldAnnotation(modify = false)
+//    private Double excessCount;
 
     @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="单次补充数量")
@@ -65,6 +65,7 @@ public class Inventory extends BaseOrder {
 
     @Column(name="LAST_SUPPLY")
     @ApiParam(value ="最后补充时间")
+    @FieldAnnotation(modify = false)
     private Date lastSupply;
 
     @JsonIgnore
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
index 626de94..e214454 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java
@@ -29,10 +29,6 @@ public class MatCalcRule extends BaseRule {
     @ApiParam(value ="物料筛选")
     private String materialFilter;
 
-    @Column(name="ROUTING_FILTER")
-    @ApiParam(value ="工艺路线筛选")
-    private String routingFilter;
-
     @Column(name="INPUT_FILTER")
     @ApiParam(value ="输入筛选")
     private String inputFilter;
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 866ebe5..1008891 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
@@ -174,6 +174,8 @@ public class Work extends BaseAPS {
 
     private transient boolean hasOptimized = false;
 
+    private transient boolean positive = true;
+
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }