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

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java

@@ -57,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="WORK_TYPE")
     @ApiParam("生产类型")
-    private String workOrderType;
+    private String workType;
 
     @Column(name="PRODUCE_CATEGORY_CODE")
     @ApiParam("产品类型代码")

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -16,30 +17,43 @@ import java.io.Serializable;
 @Data
 @Api("JIT队列列表Model")
 public class QueueOrderModel implements Serializable {
-    @ApiParam("队列ID")
-    public Long queueId;
-    @ApiParam("队列明细ID")
-    public Long queueDetailId;
     @ApiParam("队列序号")
-    public Integer queueSeq;
+    public Double queueSeq;
     @ApiParam("队列明细序号")
-    public Integer queDetailSeq;
+    public Double queDetailSeq;
     @ApiParam("客户标识号")
     public String custFlagNo;
     @ApiParam("产品配置名称")
-    public String prodCfgName;
+    public String prodCfgNameRdd;
     @ApiParam("产品类型名称")
-    public String categoryName;
+    public String categoryNameRdd;
     @ApiParam("产品条码")
     public String serialNumber;
     @ApiParam("物料号")
     public String partNo;
-    @ApiParam("物料ID")
-    public Long partId;
+    @ApiParam("物料名称")
+    public String partNameRdd;
     @ApiParam("条码状态")
     public Integer snStatus;
     @ApiParam("生产类型")
     public String workType;
+    @Transient
+    @ApiParam("显示颜色")
+    private String color;
+    public QueueOrderModel() {
+    }
 
-
+    public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.snStatus = snStatus;
+        this.workType = workType;
+    }
 }