20250522

src/printFormat/roll_label.js

@@ -311,7 +311,7 @@ function printLabel(LODOP,row,hz){
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
   //这个是固定的，在料号的后面
-  LODOP.ADD_PRINT_TEXT(14,141,66,13,"(Global P/N)");
+  LODOP.ADD_PRINT_TEXT(14,161,66,13,"(Global P/N)");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -416,7 +416,7 @@ const printVerticalLabel = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
   LODOP.SET_PRINT_STYLEA(0,"Angle",90.0);
   //这个是固定的，在料号的后面
-  LODOP.ADD_PRINT_TEXT(61,14,66,13,"(Global P/N)");
+  LODOP.ADD_PRINT_TEXT(41,14,66,13,"(Global P/N)");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);

src/views/modules/label/printer.vue

@@ -29,6 +29,7 @@ import {queryExternalLabelTemplate} from '../../../api/part/externalLabelTemplat
 import {download} from '../../../api/oss/oss'
 import {savePartInfoByExcel} from '../../../api/part/external'
 import {importSerialNumber} from '../../../api/print/print'
+import {printAntennaAutoSNLabel} from '../../../printFormat/hardwareAntennaAutoSN'
 
 const printer = {
   customerNo: '',
@@ -860,6 +861,9 @@ export default {
         if (data && data.code === 0) {
           let labelList = data.rows
           let icons = this.base64List.map((item)=>{return{icon: item,}})
+
+          // 2025-05-14 将组装好的打印对象存储到集合
+          let printLabel = [];
           for (let i = 0; i < labelList.length; i++) {
             let item = labelList[i];
             let params = {
@@ -894,19 +898,32 @@ export default {
             }
             let qrCodeList = this.$refs.qrCode.init([params.qrCode])
             params.qrCode = qrCodeList[0]
-
+            // 2025-05-14 添加到集合中   --其他保留原来方案
+            // 天线标签 && 有SN && 自动产生SN
+            if (item.printType === 'Hardware(Antenna)' && this.printCurrentPart.category === 'Hardware(Antenna)-Serials' && this.$store.state.user.autoSerialNumber === 'Y'){
+              printLabel.push({
+                ...params,
+                printerName:item.printerName,
+                icons:icons,
+              })
+            }else {
               if (item.printType === 'Alpha/Hard Tag'){
                 printAlphaHardTagLabel([params],icons,item.printerName,true)
-            }else if (item.printType === 'Hardware(Antenna)'){
-              if (this.printCurrentPart.category === 'Hardware(Antenna)-Serials'){
-                printAntennaLabel([params],icons,item.printerName,this.$store.state.user.autoSerialNumber,true)
-              }else {
+              }else if (item.printType === 'Hardware(Antenna)' && this.printCurrentPart.category === 'Hardware(Antenna)-Serials' && this.$store.state.user.autoSerialNumber === 'N'){
+                // 2025-05-15 将天线标签 && 有SN && 自动产生SN 按其他方式处理了,这里默认都是不存在SN的方式即不存在产品标签
+                printAntennaLabel([params],icons,item.printerName,'N',true)
+              }else if (item.printType === 'Hardware(Antenna)' && this.printCurrentPart.category !== 'Hardware(Antenna)-Serials'){
+                // 2025-05-15 将天线标签 && 有SN && 自动产生SN 按其他方式处理了,这里默认都是不存在SN的方式即不存在产品标签
                 printAntennaLabel([params],icons,item.printerName,'N',true)
-              }
               }else if (item.printType === 'RF' || this.currentPart.category === 'RFID'){
                 printRF_RFIDLabel([params],icons,item.printerName,true)
               }
             }
+          }
+          // 判断数组是否存在数据,存在特殊处理
+          if (printLabel.length > 0){
+            printAntennaAutoSNLabel(printLabel)
+          }
           this.printTest = false
           // let notFound = [];
           // // 打印机集合