Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -109,6 +109,8 @@ public class BaseOrder extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer delayTime;
 
+    private transient Date lastBegin;
+
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);

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

@@ -166,6 +166,9 @@ public class Work extends BaseAPS {
     @ApiParam(value ="动态拆分工作ID")
     private Long originWorkId;
 
+    @ApiParam(value ="工作排序顺序")
+    private  Integer workSeqNumber;
+
     // 排程时，找插入位置的评估值
     private transient double evaluateValue = 0;
 

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

@@ -120,6 +120,12 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="打印时间")
     private Date printTime;
 
+    @ApiParam(value ="生产结束时间")
+    @FieldAnnotation(display = false)
+    @Transient
+    @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
+    private Date resProduceEnd;
+
     @Transient
     @FieldAnnotation(property = false)
     private boolean hasCominbed = false;

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

@@ -1292,7 +1292,9 @@ public class ApsEnumUtil {
     public enum SANLUX_OPERATION_TYPE {
         NORMAL("NORMAL", "正常工序"),
         FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"),
-        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱");
+        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"),
+        FOUR_COATING("FOUR_COATING", "四车间覆胶"),
+        FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布");
 
         private String value;
         private String description;