成品标签打印

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

@@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     public QueueOrderModel() {
     }
 
@@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     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 prodCfgTypeCode,
-                           String vinCode) {
+                           String vinCode, String formulaContent, String queueGroupNo) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable {
         this.serialNumber = serialNumber;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSn

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

@@ -108,4 +108,11 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("产品配置名称")
     private String prodCfgCodeName;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+    @ApiParam("结果")
+    private String result;
+
 }