From 3815c1c73034d3a659480acee6fc876b114f311c Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Mon, 31 Aug 2020 20:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E9=87=87=E9=9B=86plc?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
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   | 2 --
 .../main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java   | 6 +++++-
 .../main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

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 397a28c..d1dcee7 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
@@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -97,7 +96,6 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
 
     @Column(name = "ERROR_MESSAGE")
     @ApiParam("异常消息")
-    @Lob
     private String errorMessage;
 
     @Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index c16f45c..0fe8aeb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -100,6 +100,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("分组序号")
     private String groupSeq;
 
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
     public QueueOrderModel() {
     }
 
@@ -185,7 +188,7 @@ public class QueueOrderModel implements Serializable {
 
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
-                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) {
+                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -201,6 +204,7 @@ public class QueueOrderModel implements Serializable {
         this.queueSeq = queueSeq;
         this.groupSeq = groupSeq;
         this.serialNumber = serialNumber;
+        this.custProdLineCode = custProdLineCode;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java
index 05e431f..c27679b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java
@@ -27,4 +27,7 @@ public class TorqueGatherModel {
 
     @ApiParam("是否合格")
     private String isQualified;
+
+    @ApiParam("颜色")
+    private String color;
 }