From 1ba56bc59a28e9e0436ac18c8d103c526333c512 Mon Sep 17 00:00:00 2001
From: simon <CSw12X45>
Date: Tue, 10 Nov 2020 15:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=87=E7=A8=8B=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 37 ++++++++++++++++++++++
 .../pojo/mes/model/QcCheckDataResultModel.java     |  7 ++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 312c1f6..cee9cc7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -3859,6 +3859,43 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 产线管控-过程检验状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_INSPECTION {
+        NOT_CREATE(10, "未创建"),
+        CREATE(20, "创建"),
+        PROCESS(30, "执行中"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        PROCESS_INSPECTION(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;
+        }
+    }
+
+    /**
      * 整体检测结果状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java
index 405f089..58803e3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -18,19 +19,19 @@ public class QcCheckDataResultModel {
     private Integer isFirstCheck;
 
     @ApiParam("首检结果")
-    private List<MesQcCheckData> firstCheckResult;
+    private List<MesQcOrder> firstCheckResult;
 
     @ApiParam("是否完成巡检")
     private Integer isOnSiteCheck;
 
     @ApiParam("巡检结果")
-    private List<MesQcCheckData> onSiteCheckResult;
+    private List<MesQcOrder> onSiteCheckResult;
 
     @ApiParam("是否完成尾检")
     private Integer isEndCheck;
 
     @ApiParam("尾检结果")
-    private List<MesQcCheckData> endCheckResult;
+    private List<MesQcOrder> endCheckResult;
 
     public QcCheckDataResultModel() {
     }