[料架条码打印优化]

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

@@ -21,17 +21,20 @@ public class QueueJitActualModule {
     private String queueGroupNo;
     @ApiParam("组内编号")
     private Integer groupNo;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 
     public QueueJitActualModule() {
 
     }
 
-    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) {
+    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
         this.id = id;
         this.vinCode = vinCode;
         this.seq = seq;
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
+        this.jitSeq = jitSeq;
     }
 
 }

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

@@ -84,6 +84,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("vin")
     private String vinCode;
 
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
     public QueueOrderModel() {
     }
 
@@ -167,7 +170,7 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
+    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -175,6 +178,7 @@ public class QueueOrderModel implements Serializable {
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
         this.isGroupPrinted = isGroupPrinted;
+        this.jitActualNo = jitActualNo;
     }
 
     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/StepPrintSnModel.java

@@ -97,7 +97,7 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("车型代码")
     private String carModuleCode;
     @ApiParam("上一个序列号")
-    private Double lastQueDetailSeq;
+    private String lastQueDetailSeq;
     @ApiParam("包装数量")
     private Integer pgCodeNum;