Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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")

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,

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;
 }