恢复部分资源评估选项。

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

@@ -49,6 +49,19 @@ public class FurnacePlan extends BaseAPS {
     @ApiParam(value ="固定组炉的计划")
     private Boolean fixPlan;
 
+    @Column(name="MERGE_PLAN_ID")
+    @ApiParam(value ="合并炉计划")
+    private Long mergePlanId;
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
+
+    public FurnacePlan getMergePlan() {
+        return BeanRelation.get(this, EFurnacePlan.MergePlan);
+    }
+
+    public void setMergePlan(FurnacePlan plan) {
+        this.mergePlanId = plan != null ? plan.getId() : 0L;
+        BeanRelation.set(this, EFurnacePlan.MergePlan, plan);
+    }
 }

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

@@ -184,6 +184,11 @@ public class Work extends BaseAPS {
     @ApiParam(value ="工作排序顺序")
     private  Integer workSeqNumber;
 
+    @Column(name="MOULD_ID")
+    @ApiParam(value ="模具能力id")
+    @FieldAnnotation(property = false)
+    private Long mouldId = 0L;
+
     // 排程时，找插入位置的评估值
     private transient double evaluateValue = 0;
     private transient boolean supplyCount = false;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EFurnacePlan {
-    WorkPlans
+    WorkPlans,
+    MergePlan,
 }

modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml

@@ -2,4 +2,6 @@
 <Class name="FurnacePlan">
     <Relation field="WorkPlans" name="WorkPlan" reverse="FurnacePlan" type="ONE_TO_MULTI" owner="true">
     </Relation>
+    <Relation field="MergePlan" name="FurnacePlan" type="MULTI_TO_ONE" owner="false">
+    </Relation>
 </Class>

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

@@ -1327,9 +1327,10 @@ public class ApsEnumUtil {
         FOUR_COATING("FOUR_COATING", "四车间覆胶"),
         FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"),
         TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"),
-        TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"),
+        TWO_MOLDING("TWO_MOLDING", "二车间成型"),
         TWO_COATING("TWO_COATING", "二车间覆胶"),
-        TWO_WRAPPING("TWO_WRAPPING", "二车间包布");
+        TWO_WRAPPING("TWO_WRAPPING", "二车间包布"),
+        TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱");
 
         private String value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -131,9 +131,6 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否重置")
     private Integer isReset;
 
-    @ApiParam(value = "任务编号")
-    private String taskNo;
-
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;