Fix Bug #10520

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

@@ -41,4 +41,8 @@ public class MesProduceCategory extends BaseBean implements Serializable {
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
+
+    @Column(name = "PRODUCE_CTGY_DESC")
+    @ApiParam("产品类型描述")
+    private String produceCategoryDesc;
 }

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

@@ -86,6 +86,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("JIT排序号")
     private String jitSeq;
 
+    @Column(name = "JIA_SEQ")
+    @ApiParam("JIA排序号")
+    private String jiaSeq;
+
     @Column(name = "SUPPLIER_CODE")
     @ApiParam("供应商代码")
     private String supplierCode;

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

@@ -120,6 +120,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("料架摆放位置")
     private String groupSide;
 
+    @Column(name = "GROUP_SEQ")
+    @ApiParam("分组序号")
+    private String groupSeq;
+
     @Transient
     @ApiParam("Vin")
     private String vinCode;

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

@@ -97,6 +97,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("配方内容")
     private String formulaContent;
 
+    @ApiParam("分组序号")
+    private String groupSeq;
+
     public QueueOrderModel() {
     }
 
@@ -180,7 +183,9 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) {
+    // 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) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -189,6 +194,12 @@ public class QueueOrderModel implements Serializable {
         this.prodCfgCode = prodCfgCode;
         this.isGroupPrinted = isGroupPrinted;
         this.jitActualNo = jitActualNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.produceCategoryCode = produceCategoryCode;
+        this.qty = qty;
+        this.vinCode = vinCode;
+        this.queueSeq = queueSeq;
+        this.groupSeq = groupSeq;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -209,7 +220,7 @@ public class QueueOrderModel implements Serializable {
 
     //getWaitQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) {
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String queueGroupNo, Integer groupNo) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -225,6 +236,8 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
         this.pptCode = pptCode;
         this.produceCategoryCode = produceCategoryCode;
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
     }
 
     //getWaitQueueOrderModelNoSnMgn

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

@@ -92,14 +92,28 @@ public class StepPrintSnModel extends MesProduceSn {
     private String vinCode;
     @ApiParam("客户JIT生产队列排序号")
     private Double seq;
-    @ApiParam("jit车号")
-    private String jitCarNo;
+    @ApiParam("JIA排序号")
+    private String jiaSeq;
+    @ApiParam("JIP排序号")
+    private String jipSeq;
     @ApiParam("车型代码")
     private String carModuleCode;
     @ApiParam("上一个序列号")
-    private String lastQueDetailSeq;
+    private String lastSeq;
+    @ApiParam("第一个序列号")
+    private String firstSeq;
+    @ApiParam("序列架号")
+    private String serialFrameNum;
+    @ApiParam("DOCK")
+    private String dock;
     @ApiParam("包装数量")
-    private Integer pgCodeNum;
+    private Integer pgNum;
+    @ApiParam("数量")
+    private Integer num;
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+    @ApiParam("产品类型描述")
+    private String produceCategoryDesc;
 
     @ApiParam("批次")
     private String lotNo;