新增三力士换模时间计算

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;

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;

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

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;

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);
     }