From 260899368dcf8c4e4c9587e5ca4fa1f219b382d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Mon, 1 Jun 2020 17:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908685=C2=A005=202.3.3.6=20=E9=98=9F?=
 =?UTF-8?q?=E5=88=97=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0-=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=AB=AF-=E6=9F=A5=E3=80=81=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index 948b1f9..1e9fc97 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -160,6 +160,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("年度型")
     private String modelYear;
 
+    @Transient
+    @ApiParam("主队列状态")
+    private Integer masterStatus;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -186,8 +190,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     }
 
     public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
-                            Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
-                            String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+                               Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
+                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
         this.orderNo = orderNo;
         this.vinCode = vinCode;
         this.partNo = partNo;