增加4车间补满模逻辑

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

@@ -99,6 +99,11 @@ public class BaseOrder extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer validOrder = CommonEnumUtil.VALID;
 
+    @Column(name="DELAY")
+    @ApiParam(value ="是否延期")
+    @FieldAnnotation(modify = false)
+    private Boolean delay = false;
+
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);

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

@@ -37,6 +37,10 @@ public class FurnacePlan extends BaseAPS {
     @ApiParam(value ="已占用的能力")
     private Double capacity;
 
+    @Column(name="CAPACITY_LIMIT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="容量限制")
+    private Double capacityLimit;
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
 }

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 排程优化规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-03-24
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_HEURISTIC_OPTIMIZE")
+@Api("排程优化规则")
+public class HeuristicOptimize extends BaseRule {
+    private static final long serialVersionUID = -464821596740369199L;
+
+    @Column(name="WORK_FILTER")
+    @ApiParam(value ="工作筛选")
+    private String workFilter;
+
+    @Column(name="RES_FILTER")
+    @ApiParam(value ="资源筛选")
+    private String resFilter;
+
+    @Lob
+    @Column(name="RES_SELECT")
+    @ApiParam(value ="资源选择")
+    private String resSelect;
+
+    @Column(name="OPTIMIZE_INTERVAL")
+    @ApiParam(value ="优化间隔")
+    private String optimizeInterval;
+}

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

@@ -53,9 +53,4 @@ public class HeuristicRule extends BaseRule {
     @ApiParam(value ="组炉区间")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String batchPeriod;
-
-    @Column(name="PRD_NO_LIMIT")
-    @ApiParam(value ="组炉商标个数限制")
-    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
-    private Integer prdNoLimit;
 }

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

@@ -18,7 +18,6 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Description :工作计划
@@ -110,6 +109,7 @@ public class WorkPlan extends BaseAPS {
     private Long furnacePlanId;
 
     @Transient
+    @FieldAnnotation(property = false)
     private boolean hasCominbed = false;
 
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.HeuristicOptimize;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface HeuristicOptimizeRepository extends CrudRepository<HeuristicOptimize, Long> {
+}