演示问题修复

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

@@ -97,12 +97,17 @@ public class BaseOrder extends BaseAPS {
     @Column(name="VALID_ORDER")
     @ApiParam(value ="有效订单")
     @FieldAnnotation(modify = false)
-    private ApsEnumUtil.ORDER_VALID_TYPE validOrder = ApsEnumUtil.ORDER_VALID_TYPE.VALID;
+    private Boolean validOrder = true;
 
-    @Column(name="DELAY")
+    @Column(name="INVALID_REASON")
-    @ApiParam(value ="是否延期")
+    @ApiParam(value ="无效原因")
     @FieldAnnotation(modify = false)
-    private Boolean delay = false;
+    private String invalidReason;
+
+    @Column(name="DELAY_TIME")
+    @ApiParam(value ="延期时间")
+    @FieldAnnotation(modify = false)
+    private Integer delayTime;
 
     @JsonBackReference
     public List<Work> getWorks() {

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

@@ -27,7 +27,7 @@ public class FieldSetRule extends BaseRule {
     private static final long serialVersionUID = 6880145972942618559L;
     @Column(name="BEAN")
     @ApiParam(value ="实体名")
-    private ApsEnumUtil.FIELD_SET_BEAN bean;
+    private String bean;
 
     @Column(name="FILTER")
     @ApiParam(value ="筛选")

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

@@ -29,6 +29,10 @@ 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/Operation.java

@@ -90,10 +90,6 @@ public class Operation extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
-    @Column(name="MANU_OPER")
-    @ApiParam(value ="是否手工工序")
-    private Boolean manuOper;
-
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EOperation.ProductRouting);
     }

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

@@ -61,6 +61,10 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(defaultValue = "WAITING")
     private ApsEnumUtil.SALES_ORDER_STATUS orderStatus;
 
+    @Column(name="DELIVER_RATE")
+    @ApiParam(value ="发货百分比")
+    private Double deliverRate;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

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

@@ -45,4 +45,8 @@ public class SysParam extends BaseAPS {
     @ApiParam(value ="规则组id")
     @FieldAnnotation(display = false)
     private Long ruleGroupId;
+
+    @Column(name="INVENTORY_RATE")
+    @ApiParam(value ="库存误差百分比")
+    private Double inventoryRate;
 }

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

@@ -164,6 +164,8 @@ public class Work extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long dynSplitWorkId;
 
+    private transient boolean hasOptimized = false;
+
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan;
+import cn.estsh.i3plus.pojo.aps.bean.Resource;
+import cn.estsh.i3plus.pojo.aps.bean.WorkPlan;
+import lombok.Data;
+
+/**
+ * @Description : 计划记录
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
+@Data
+public class PlanRecord {
+    /**
+     * 需要插入的工作计划
+     */
+    private WorkPlan plan;
+    /**
+     * 插入到目标资源
+     */
+    private Resource resource;
+    /**
+     * 插入到目标工作计划前面
+     */
+    private WorkPlan postPlan;
+
+    /**
+     * 插入到指定炉资源上
+     */
+    private FurnacePlan furnacePlan;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.bean.Work;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description : 工作排程记录
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
+@Data
+public class WorkRecord {
+    private Work work;
+    private Work splitWork;
+    private PlanRecord mainPlan;
+    private List<PlanRecord> assPlans = new ArrayList<>();
+}

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

@@ -741,8 +741,8 @@ public class ApsEnumUtil {
     public enum WORK_STATUS {
         NOPLAN("NOPLAN", "未计划"),
         PLANDONE("PLANDONE", "计划完毕"),
-        INDICATIONDONE("INDICATIONDONE", "指示完毕"),
+        INDICATIONDONE("INDICATIONDONE", "锁定"),
-        CONFIRM("CONFIRM", "确认"),
+        CONFIRM("CONFIRM", "下发"),
         STARTPRODUCT("STARTPRODUCT", "开始生产"),
         FINISH("FINISH", "完成");