From 0d12d01ebfb0db7e9ab341adea804119d26fbbfb Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 30 Oct 2020 17:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=8A=9F=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java   | 4 ++++
 .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index b9aeefa..cfcc146 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -157,6 +157,10 @@ public class IfProductOffLine extends BaseBean implements Serializable {
     @ApiParam("BaseModule零件号")
     private String baseModule;
 
+    @Column(name = "QUEUE_GROUP_FLAG")
+    @ApiParam("分组标识")
+    private String queueGroupFlag;
+
     public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) {
         this.partNo = partNo;
         this.packageNo = packageNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
index 9827255..6640422 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
@@ -16,12 +16,15 @@ import java.util.Map;
 @Data
 public class MgnBjBoardModel implements Serializable {
 
+    private Integer qty;
     @ApiParam("jsa数量")
     private Integer jsaQty;
     @ApiParam("jsa数量")
     private Integer jsaRate;
     @ApiParam("完成数量")
     private Integer completeQty;
+    @ApiParam("完成率")
+    private Integer completeRate;
     @ApiParam("总数量")
     private Integer totalQty;
     @ApiParam("预警数量")
@@ -33,6 +36,9 @@ public class MgnBjBoardModel implements Serializable {
     @ApiParam("一次合格率")
     private Integer onceQualityRate = 0;
 
+    @ApiParam(value = "显示颜色")
+    private String color;
+
     @ApiParam("x坐标内容")
     private String xAxis;