核心包代码优化。

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

@@ -1,63 +0,0 @@
-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;
-
-    @Lob
-    @Column(name="WORK_SORT")
-    @ApiParam(value ="工作排序")
-    private String workSort;
-
-    @Column(name="RES_FILTER")
-    @ApiParam(value ="资源筛选")
-    private String resFilter;
-
-    @Lob
-    @Column(name="RES_SELECT")
-    @ApiParam(value ="资源选择")
-    private String resSelect;
-
-    @Column(name="WAITING_TIME")
-    @ApiParam(value ="最大等待时间")
-    private String waitingTime;
-
-    @Column(name="OPTIMIZE_INTERVAL")
-    @ApiParam(value ="优化间隔")
-    private String optimizeInterval;
-
-    @Column(name="MAX_WAITING_LIMIT")
-    @ApiParam(value ="最大等待时间限制")
-    private Boolean maxWaitingLimit;
-
-    @Column(name="MAX_WAITING_ADJUST")
-    @ApiParam(value ="最大等待时间调整")
-    private Boolean maxWaitingAdjust;
-}

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

@@ -31,9 +31,9 @@ public class HeuristicRule extends BaseRule {
     @ApiParam(value ="工作筛选")
     private String workFilter;
 
-    @Column(name="RES_FILTER")
+//    @Column(name="RES_FILTER")
-    @ApiParam(value ="资源筛选")
+//    @ApiParam(value ="资源筛选")
-    private String resFilter;
+//    private String resFilter;
 
     @Lob
     @Column(name="WORK_SORT")

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

@@ -68,10 +68,4 @@ public class MatCalcRule extends BaseRule {
     @Column(name="BATCH_SUPPLY")
     @ApiParam(value ="批量补充")
     private Boolean batchSupply;
-
-    @Column(name="ASSIGN_LIMIT")
-    @ApiParam(value ="物料分配制约")
-    @FieldAnnotation(multiEnumClass = ApsEnumUtil.MATERIAL_ASSIGN_LIMIT.class)
-    private Integer assignLimit;
-
 }

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

@@ -37,11 +37,6 @@ public class SysParam extends BaseAPS {
     @FieldAnnotation(defaultValue = "20")
     private Integer maxInterruptCount = 20;
 
-    @Column(name="TYPE")
-    @ApiParam(value ="工艺路径有效判断类型")
-    @FieldAnnotation(defaultValue = "CALC_LET_LT")
-    private ApsEnumUtil.ROUTING_VALID_TYPE type;
-
     @Column(name="RULE_GROUP_ID")
     @ApiParam(value ="规则组id")
     @FieldAnnotation(display = false)

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

@@ -132,10 +132,10 @@ public class Work extends BaseAPS {
     @ApiParam(value ="已分割的工作是否固定")
     private Boolean fixSplit;
 
-    @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)")
+//    @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="需要的前工作数量")
+//    @ApiParam(value ="需要的前工作数量")
-    @FieldAnnotation(display = false, modify = false)
+//    @FieldAnnotation(display = false, modify = false)
-    private Double needPrevCount;
+//    private Double needPrevCount;
 
     @Column(name="SCH_FAILED")
     @ApiParam(value ="是否排程失败")
@@ -175,9 +175,9 @@ public class Work extends BaseAPS {
     @ApiParam(value ="动态拆分工作ID")
     private Long originWorkId;
 
-    @Column(name="SUPPLY_WORK_CODE")
+//    @Column(name="SUPPLY_WORK_CODE")
-    @ApiParam(value ="补满模工作编码")
+//    @ApiParam(value ="补满模工作编码")
-    private String supplyWorkCode;
+//    private String supplyWorkCode;
 
     @ApiParam(value ="工作排序顺序")
     private Integer workSeqNumber;

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

@@ -1,9 +0,0 @@
-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> {
-}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -378,7 +378,7 @@ public class ApsEnumUtil {
         PRODUCE_TIME("PRODUCE_TIME", "生产时间"),
         POST_SET_TIME("POST_SET_TIME", "后设置时间"),
         WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"),
-        WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"),
+//        WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"),
         WAIT_END_SUB_LEFT("WAIT_END_SUB_LEFT", "工作结束时间减去左边界"),
         RES_BALANCE("RES_BALANCE", "资源均衡度"),
         SAME_MATERIAL("SAME_MATERIAL", "相同物料"),
@@ -470,33 +470,6 @@ public class ApsEnumUtil {
     }
 
     /**
-     * 工艺路径有效性判断类型
-     */
-    public enum ROUTING_VALID_TYPE implements Enumerator {
-        ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"),
-        CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"),
-        BASE_TIME("BASE_TIME", "与基准时刻做比较");
-
-        private final String value;
-        private final String description;
-
-        ROUTING_VALID_TYPE(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        @Override
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String getDescription() {
-            return description;
-        }
-    }
-
-    /**
      * 使用类型
      */
     public enum USE_TYPE implements Enumerator {