调整过程检验返回结果

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)

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() {
     }