【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】

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

@@ -7588,4 +7588,81 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * mes 数据来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_DATA_SOURCE {
+        MANUAL_INPUT(10, "10", "人工输入"),
+        DB(30, "30", "数据库"),
+        PLC(20, "20", "PLC");
+
+        private int value;
+        private String description;
+        private String code;
+
+        QC_CHECK_DATA_SOURCE(int value, String code, String description) {
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * mes 检验值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_VALUE_TYPE {
+        STRING(10, "字符串"),
+        INTEGER(20, "数值");
+
+        private int value;
+        private String description;
+
+        QC_CHECK_VALUE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java

@@ -98,7 +98,7 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     private String dataSource;
 
     @Column(name = "CHECK_VALUE_TYPE")
-    @ApiParam("任务单类型")
+    @ApiParam("检测值类型")
     private String checkValueType;
 
     @Column(name = "CHECK_CFG_NO")