From c73ef2b93b8296134def865de7354610b1517389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Tue, 30 Jun 2020 18:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=B7=A5=E4=BD=8D=E5=92=8C=E4=B8=80=E6=AC=A1=E3=80=81?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81Un-Pack-=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=BC=80=E5=8F=91=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java   |  4 ++--
 .../java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java | 12 ++++--------
 2 files changed, 6 insertions(+), 10 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 0ff1771..19f6de5 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
@@ -4266,8 +4266,8 @@ public class MesPcnEnumUtil {
     public enum BAD_HANDLE_TYPE {
         BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
         SCRAPPED(20, "SCRAPPED", "报废"),
-        POLISH(30, "POLISH", "抛光"),
-        DETERMINED(40, "DETERMINED", "待定");
+        POLISHING(30, "POLISHING", "抛光"),
+        DETERMIND(40, "DETERMIND", "待定");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
index 80c483b..8dfadf4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
 import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.List;
 
 /**
@@ -39,22 +39,18 @@ public class PaintCheckModel {
     @ApiParam("界面编号")
     private String windowNo;
 
-    @ApiParam("缺陷类型")
-    private String defectType;
-
-    @ApiParam("缺陷描述")
-    private String defectDesc;
-
     @ApiParam("缺陷标识值")
     private String defectFlagValue;
 
     @ApiParam("不良品处理类型")
     private Integer defectActionType;
 
-    @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("缺陷列表")
+    private List<MesDefect> defectList;
+
     @ApiParam("界面组件参数数据")
     List<MesWindowModuleParam> windowModuleParamList;
 }