修改BH基础数据

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

@@ -7161,4 +7161,78 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * BH库位类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_LOCATE_TYPE {
+        HOLD(10, "HOLD", "HOLD库位"),
+        WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"),
+        WAIT_OUT(30, "WAIT_OUT", "待出库库位");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_LOCATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_LOCATE_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : BH检测大类表
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "QMS_CHECK_TYPE")
+@Api("物料子检测项")
+public class QmsCheckType extends BaseBean {
+
+    private static final long serialVersionUID = -4867744538301370899L;
+
+    @Column(name = "CHECK_TYPE_CODE")
+    @ApiParam("检测大类代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkTypeCode;
+
+    @Column(name = "CHECK_TYPE_NAME")
+    @ApiParam("检测大类名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkTypeName;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String remark;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java

@@ -31,10 +31,6 @@ import javax.persistence.Table;
 public class WmsBhChildDetectionItem extends BaseBean {
 
     private static final long serialVersionUID = -8005468634643773682L;
-    @Column(name = "CHECK_TYPE")
-    @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
-    private Integer checkType;
 
     @Column(name = "ITEM_CHECK_CODE")
     @ApiParam("子检测项代码")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -272,13 +272,18 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double curingTime = 0d;
 
-
     @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否回收", example = "2")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
     public Integer isRecycle;
 
+    @Column(name = "BH_LOCATE_TYPE")
+    @ApiParam(value = "BH库位类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer bhLocateType;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java

@@ -48,8 +48,8 @@ public class WmsPartCheckType extends BaseBean {
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
-    private Integer checkType;
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkType;
 
     @Column(name = "SAMPLE_SIZE")
     @ApiParam("样本数")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java

@@ -43,8 +43,8 @@ public class WmsPartItemCheck extends BaseBean {
 
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
-    private Integer checkType;
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkType;
 
     @Column(name = "CHECK_ITEM_CODE")
     @ApiParam("子检测项代码")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface QmsCheckTypeRepository extends BaseRepository<QmsCheckType, Long> {
+}