Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4888,4 +4888,51 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 产品特性
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TRAIT {
+        NORMAL(10, "正常件"),
+        FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
+        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"),
+        FICTIVE(40, "虚拟件");
+
+        private int value;
+        private String description;
+
+        PART_TRAIT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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/bean/MesPackage.java

@@ -148,6 +148,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("不良处理类型")
     private String defectActionType;
 
+    @Transient
+    @ApiParam("明细总数")
+    private Integer detailTotal = 0;
+
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java

@@ -49,4 +49,7 @@ public class PaintOnLineModel {
 
     @ApiParam("过程条码")
     private String serialNumber;
+
+    @ApiParam("是否虚拟件")
+    private Integer isFictive = 2;
 }

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