From 7b6b97c1b7a6154c5a0550e82f93d98c98efe66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Thu, 12 Nov 2020 16:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5=E6=B6=82?=
 =?UTF-8?q?=E8=A3=85=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java     |  6 ++++++
 .../estsh/i3plus/pojo/mes/bean/MesDefectRecord.java  | 19 +++++++++++++++++++
 .../estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 20 +++++++++++++++++++-
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
index c7cdeb4..d5e92b6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
@@ -77,4 +77,10 @@ public class MesDefect extends BaseBean implements Serializable {
         this.defectType = defectType;
         this.defectTypeName = defectTypeName;
     }
+
+    public MesDefect(String defectType, String defectCode, String defectName) {
+        this.defectType = defectType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
index e7ae500..bd1dd11 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
@@ -105,7 +105,26 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("缺陷类型名称")
     private String defectActionTypeName;
 
+    @Transient
+    @ApiParam("缺陷数量")
+    private Integer defectQty;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
+
+    public MesDefectRecord() {
+
+    }
+
+    public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType,
+                           String defectCode, String defectName, Integer defectQty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.workOrderNo = workOrderNo;
+        this.defectActionType = defectActionType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectQty = defectQty;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java
index fcf9501..c77b789 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java
@@ -5,12 +5,13 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 @Data
-public class TJMgnBoardModel extends BaseBean {
+public class TJMgnBoardModel extends BaseBean implements Serializable {
 
     @ApiParam("工单号")
     private String workOrderNo;
@@ -21,6 +22,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("物料名称")
     private String partNameRdd;
 
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("条码数量")
+    private Integer snQty;
+
     @ApiParam("颜色")
     private String partColor;
 
@@ -74,4 +81,15 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("结束工单")
     private String workOrderNoEnd;
 
+    public TJMgnBoardModel() {
+    }
+
+    public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.workOrderNo = workOrderNo;
+        this.snQty = snQty;
+    }
+
 }