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/PlanFeedback.java

@@ -41,7 +41,7 @@ public class PlanFeedback extends BaseAPS {
 
     @Column(name="TOP_ORDER_ID")
     @ApiParam(value ="顶层订单")
-    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order")
+    @FieldAnnotation(popSearch = true, relation = "Order")
     private Long topOrderId;
 
     @Column(name="STATUS")

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

@@ -142,6 +142,10 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="调整时间")
     private Date adjustDate;
 
+    @Column(name="MOULD_CODE")
+    @ApiParam(value ="模具编码")
+    private String mouldCode;
+
     @JsonIgnore
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 

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

@@ -19,4 +19,5 @@ public enum EWorkPlan {
     FurnacePlan,
     PrevAssPlan,
     PostAssPlan,
+    Mould
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.validator;
 import cn.estsh.i3plus.pojo.aps.annotation.CalendarTimeAnntation;
 import cn.estsh.i3plus.pojo.aps.model.TimeBlock;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -14,11 +15,13 @@ public class CalendarTimeValidator implements ConstraintValidator<CalendarTimeAn
 
     @Override
     public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
+        if(StringUtils.isEmpty(s)){
+            return true;
+        }
         for (String strTime : s.split(",")) {
             if (StringUtil.isEmpty(strTime)) {
                 continue;
             }
-
             String[] times = strTime.split("~");
             if (times.length == 1) {
                 try {

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

@@ -1199,7 +1199,12 @@ public class ApsEnumUtil {
         TWO_COATING("TWO_COATING", "二车间覆胶"),
         TWO_WRAPPING("TWO_WRAPPING", "二车间包布"),
         TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"),
-        FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱");
+        FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱"),
+        THIRD_SULFIDATION("THIRD_SULFIDATION", "汽车带硫化"),
+        THIRD_MOLDING("THIRD_MOLDING", "汽车带成型"),
+        THIRD_CUTTING("THIRD_CUTTING", "汽车带切割"),
+        THIRD_SMALLGRIND("THIRD_SMALLGRIND", "汽车带小磨"),
+        THIRD_BIGGRIND("THIRD_BIGGRIND", "汽车带大磨");
 
         private final String value;
         private final String description;