过程检测 完成首检判断

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

@@ -5208,18 +5208,59 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 客户JIT生产队列状态
+     * 过程检测数据源类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_CHECK_DATA_SOURCE {
-        DB(10, "数据库"),
+        DB(10, "10", "数据库"),
-        PLC(20, "PLC"),
+        PLC(20, "20", "PLC"),
-        MANUAL_INPUT(30, "人工输入");
+        MANUAL_INPUT(30, "30", "人工输入");
+
+        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;
+        }
+    }
+
+    /**
+     * 过程检测检测对象数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_VALUE_TYPE {
+        STRING(10, "字符串"),
+        INTEGER(20, "数值");
 
         private int value;
         private String description;
 
-        QC_CHECK_DATA_SOURCE(int value, String description) {
+        QC_CHECK_VALUE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -64,14 +64,6 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("是否允许让步")
     private Integer isConcession = 0;
 
-    @Column(name = "CHECK_REULST")
-    @ApiParam("判定结果")
-    private Integer checkReulst = 0;
-
-    @Column(name = "CHECK_VALUE")
-    @ApiParam("检测值")
-    private String checkValue;
-
     @Column(name = "ITEM_NO")
     @ApiParam("检验行号")
     private Integer itemNo = 0;
@@ -120,4 +112,16 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @Transient
     private String businessTypeName;
 
+    @Column(name = "CHECK_CFG_NO")
+    @ApiParam("检测值配置编号")
+    private String checkCfgNo;
+
+    @Transient
+    @ApiParam("判定结果")
+    private Integer checkResult = 0;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesQcOrderRecordRepository extends BaseRepository<MesQcOrderRecord, Long> {
+
+}