From 2f81a0f35d5c65ed645c18e99ba74125c6779a33 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: Wed, 4 Nov 2020 15:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5=E6=B6=82?=
 =?UTF-8?q?=E8=A3=85=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java   | 11 +++++++++++
 .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java     | 11 ++++++++++-
 .../java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java  |  9 +++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java
index e40623b..004561a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class MgnBoardAreaYieldModel {
 
@@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel {
     @ApiParam("注塑")
     private MgnBoardListModel injectMoldBoardListModel;
 
+    @ApiParam("组装集合")
+    private List<MgnBoardListModel> assembleBoardListModelList;
+
+    @ApiParam("涂装集合")
+    private List<MgnBoardListModel> paintBoardListModelList;
+
+    @ApiParam("注塑集合")
+    private List<MgnBoardListModel> injectMoldBoardListModelList;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
index 8ad36ad..7c6d1aa 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
@@ -38,10 +38,19 @@ public class MgnBoardListModel {
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
-    @ApiParam("异常数量")
+    @ApiParam("呼叫异常数量")
     private Integer exceptQty;
 
+    @ApiParam("响应异常数量")
+    private Integer responseQty;
+
     @ApiParam("正常数量")
     private Integer normalQty;
 
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("车间")
+    private String areaCode;
+
 }
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 b55ccd2..fcf9501 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
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -65,4 +66,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("不良汇总列值")
     private List<Double> defectValueList;
 
+    @Transient
+    @ApiParam("开始工单")
+    private String workOrderNoStart;
+
+    @Transient
+    @ApiParam("结束工单")
+    private String workOrderNoEnd;
+
 }