Merge remote-tracking branch 'origin/master'

src/printFormat/hardwareAntennaAutoSN.js

@@ -43,9 +43,9 @@ export const printAntennaAutoSNLabel = (printList) => {
         //console.log(i)
         //如果打印正常的标签
         // 处理偏移量
-        LODOP.PRINT_INITA(offsetY,offsetX,1100,512)
+        LODOP.PRINT_INITA(offsetY,offsetX,1100,1005)
         LODOP.SET_PRINTER_INDEXA(row.printerName)
-        LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '')
+        LODOP.SET_PRINT_PAGESIZE(0, 1100, 1005, '')
         // 设置TOP高度
         sizeTop = 0;// 重置top值
       }else {
@@ -57,16 +57,17 @@ export const printAntennaAutoSNLabel = (printList) => {
       if (row.printLabelType === 0 || row.printLabelType === 2){
         printProductLabel(LODOP,row,row.printLabelType === 0?190:sizeTop)// 产品标签
       }
-      if (row.printLabelType === 0 || (row.printLabelType !== 0 && i%2 === 1)){
+      if (row.printLabelType === 0 || i%2 === 1){
         LODOP.PRINT();
+        //LODOP.PRINT_DESIGN();
       }
     }
     //LODOP.PREVIEW();
-    // 处理 最后一张纸张只有一个标签时
-    if (printList.length % 2 === 1){
+    // 处理最后一张纸张只有一个标签时的情况
+    if (printList.length % 2 === 1 && printList[printList.length - 1].printLabelType !== 0) {
       LODOP.PRINT();
     }
-    // LODOP.PRINT_DESIGN();
+    /* LODOP.PRINT_DESIGN(); */
   }
 }