新增成品检验报工

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
@@ -97,7 +98,7 @@ public class BaseOrder extends BaseAPS {
     @Column(name="VALID_ORDER")
     @ApiParam(value ="有效订单")
     @FieldAnnotation(modify = false)
-    private Integer validOrder = CommonEnumUtil.VALID;
+    private ApsEnumUtil.ORDER_VALID_TYPE validOrder = ApsEnumUtil.ORDER_VALID_TYPE.VALID;
 
     @Column(name="DELAY")
     @ApiParam(value ="是否延期")

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

@@ -54,6 +54,14 @@ public class ImportField extends BaseAPS {
     @FieldAnnotation(defaultValue = "255")
     private Integer maxLength;
 
+    @Column(name="VALIDATOR")
+    @ApiParam("校验表达式")
+    private String validator;
+
+    @Column(name="VALIDATOR_MESSAGE")
+    @ApiParam("校验表达式报错")
+    private String validatorMessage;
+
     @Column(name="RELATION_TABLE")
     @ApiParam("关联表名")
     private String relationTable;

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :优先级
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-08
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_PRIORITY_TYPE")
+@Api("优先级")
+public class PriorityType extends BaseAPS {
+    private static final long serialVersionUID = 445577901076659576L;
+
+    @Column(name="CODE")
+    @ApiParam(value ="标识")
+    @FieldAnnotation(mainkey = true)
+    private String code;
+
+    @Column(name="VALUE")
+    @ApiParam(value ="值")
+    private Integer value;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.PriorityType;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PriorityTypeRepository extends CrudRepository<PriorityType, Long> {
+}

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

@@ -81,6 +81,31 @@ public class ApsEnumUtil {
     }
 
     /**
+     * 物料类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_VALID_TYPE {
+        VALID("VALID", "有效"),
+        INVALID("INVALID", "无效");
+
+        private String value;
+        private String description;
+
+        ORDER_VALID_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 物料报表统计类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)