1：新增实现生产时间的计算逻辑

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

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -19,4 +22,27 @@ import javax.persistence.Table;
 @Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
 @Api("副资源设置时间")
 public class AssistResourceSetTime extends BaseAPS {
+    @Column(name="RES_CODE")
+    @ApiParam(value ="资源编码")
+    private String resCode;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="副资源使用类型")
+    private USE_TYPE type;
+
+    @Column(name="PREV_RESOURCE")
+    @ApiParam(value ="前资源编码")
+    private String prevResource;
+
+    @Column(name="POST_RESOURCE")
+    @ApiParam(value ="后资源编码")
+    private String postResource;
+
+    @Column(name="TIME")
+    @ApiParam(value ="设置时间")
+    private String time;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private int priority;
 }

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

@@ -1,9 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC;
+import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -19,4 +23,35 @@ import javax.persistence.Table;
 @Table(name = "APS_DYNAMIC_SET_TIME")
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
+    @Column(name="RES_CODE")
+    @ApiParam(value ="资源代码")
+    private String resCode;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="应用工作计划类型")
+    private DYNAMIC_SET_TYPE type;
+
+    @Column(name="CONSIDER_ASS_RES")
+    @ApiParam(value ="是否启用副资源动态设置时间")
+    private Boolean considerAssRes;
+
+    @Column(name="CONSIDER_MATERIAL")
+    @ApiParam(value ="是否启用物料动态设置时间")
+    private Boolean considerMaterial;
+
+    @Column(name="ASS_RES_CALC")
+    @ApiParam(value ="副资源动态设置计算方式")
+    private DYNAMIC_SET_CALC assResCalc;
+
+    @Column(name="MATERIAL_CALC")
+    @ApiParam(value ="物料动态设置时间计算方式")
+    private DYNAMIC_SET_CALC materialCalc;
+
+    @Column(name="STATIC_CALC")
+    @ApiParam(value ="与静态设置时间计算方式")
+    private DYNAMIC_SET_CALC staticCalc;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private int priority;
 }

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

@@ -2,8 +2,10 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -19,4 +21,23 @@ import javax.persistence.Table;
 @Table(name = "APS_MATERIAL_SET_TIME")
 @Api("物料设置时间")
 public class MaterialSetTime extends BaseAPS {
+    @Column(name="RES_CODE")
+    @ApiParam(value ="资源编码")
+    private String resCode;
+
+    @Column(name="PREV_MATERIAL")
+    @ApiParam(value ="前物料编码")
+    private String prevMaterial;
+
+    @Column(name="POST_MATERIAL")
+    @ApiParam(value ="后物料编码")
+    private String postMaterial;
+
+    @Column(name="TIME")
+    @ApiParam(value ="设置时间")
+    private String time;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private int priority;
 }