From 0e9f13ff82bc07cfcb88bbcfb97a338d852e2077 Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Fri, 22 Nov 2019 17:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6582=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=BA=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java  |  6 +++
 .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 46 ++++++++++++++++++++++
 .../i3plus/pojo/mes/pcn/model/MesDefectModel.java  |  4 ++
 3 files changed, 56 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
index fa5a461..f1bd5b8 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
@@ -43,10 +43,16 @@ public class MesDefect extends BaseBean {
     private String defectType;
 
     @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+
+    @Transient
     @ApiParam("缺陷位置")
     private String defectLocation;
 
     @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
+
+
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java
new file mode 100644
index 0000000..d7e20a0
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\22 16:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TYPE_CFG")
+@Api("类型信息表")
+public class MesTypeCfg extends BaseBean {
+
+    @Column(name = "TYPE_CODE")
+    @ApiParam("类型代码")
+    private String typeCode;
+
+    @Column(name = "TYPE_NAME")
+    @ApiParam("类型名称")
+    private String typeName;
+
+    @Column(name = "BUSINESS_TYPE_CODE")
+    @ApiParam("业务类型代码")
+    private String businessTypeCode;
+
+    @Column(name = "BUSINESS_TYPE_NAME")
+    @ApiParam("业务类型名称")
+    private String businessTypeName;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java
index b9acba1..57ba538 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java
@@ -26,6 +26,10 @@ public class MesDefectModel {
     private String defectType;
 
     @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+
+    @Transient
     @ApiParam("缺陷分类子集")
     private List<MesDefect> mesDefectList;
 }