From 50b9853be04f8ad7b6cec7efb8476ad9485f8ce2 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Fri, 28 Feb 2025 10:02:18 +0800 Subject: [PATCH] 20250228 --- src/printFormat/RF_RFID.js | 8 +++----- src/printFormat/alphaHardTagPrintFormat.js | 12 +++++------- src/printFormat/antenna.js | 12 +++++------- src/printFormat/logisticLabel.js | 8 +++----- src/printFormat/roll_label.js | 6 ++---- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js index 368c57f..d33c919 100644 --- a/src/printFormat/RF_RFID.js +++ b/src/printFormat/RF_RFID.js @@ -14,18 +14,16 @@ export const printRF_RFIDLabel = (printList, icons, printerName,testFlag = false for (let i = 0; i < printList.length; i++) { let row = printList[i] let direction = ''; - let offsetX = 0; - let offsetY = 0; + let offsetX = row.offsetX; + let offsetY = row.offsetY; if (testFlag){ direction = row.direction - offsetX = row.offsetX - offsetY = row.offsetY } //如果打印正常的标签 LODOP.NewPageA(); LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - LODOP.SET_PRINT_PAGESIZE(direction === 'Vertical'?0:0,1100,512,""); + LODOP.SET_PRINT_PAGESIZE(direction === 'Vertical'?2:0,1100,512,""); LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(4,+255,90,16,""); diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js index 15489db..d18b484 100644 --- a/src/printFormat/alphaHardTagPrintFormat.js +++ b/src/printFormat/alphaHardTagPrintFormat.js @@ -26,12 +26,10 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag) { for (let i = 0; i < printList.length; i++) { let row = printList[i] let direction = ''; - let offsetX = 0; - let offsetY = 0; + let offsetX = row.offsetX; + let offsetY = row.offsetY; if (flag === true){ direction = row.direction - offsetX = row.offsetX - offsetY = row.offsetY } //如果打印正常的标签 LODOP.NewPageA(); @@ -44,17 +42,17 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag) { if (row.printLabelType === 0 || row.printLabelType === 1){ LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - printCartonLabel(LODOP,row,icons,direction === 'Vertical'?0:0) // 箱标签 + printCartonLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签 } if (row.printLabelType === 0 || row.printLabelType === 2){ LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - printProductLabel(LODOP,row,direction === 'Vertical'?0:0) + printProductLabel(LODOP,row,direction === 'Vertical'?2:0) } }else { LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - printCartonLabel(LODOP,row,icons,direction === 'Vertical'?0:0) // 箱标签 + printCartonLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签 } LODOP.PRINT() } diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js index 83055be..3226cdf 100644 --- a/src/printFormat/antenna.js +++ b/src/printFormat/antenna.js @@ -23,12 +23,10 @@ export const printAntennaLabel = (printList, icons, printerName,flag,testFlag = for (let i = 0; i < printList.length; i++) { let row = printList[i] let direction = ''; - let offsetX = 0; - let offsetY = 0; + let offsetX = row.offsetX; + let offsetY = row.offsetY; if (testFlag){ direction = row.direction - offsetX = row.offsetX - offsetY = row.offsetY } //如果打印正常的标签 LODOP.NewPageA(); @@ -42,13 +40,13 @@ export const printAntennaLabel = (printList, icons, printerName,flag,testFlag = sizeTop = 0; } if (row.printLabelType === 0 || row.printLabelType === 1){ - printLabel(LODOP,row,icons,direction === 'Vertical'?0:0) // 箱标签 + printLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签 } if (row.printLabelType === 0 || row.printLabelType === 2){ - printProductLabel(LODOP,row,direction === 'Vertical'?0:0) + printProductLabel(LODOP,row,direction === 'Vertical'?2:0) } }else { - printLabel(LODOP,row,icons,direction === 'Vertical'?0:0) // 箱标签 + printLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签 } } //LODOP.PREVIEW(); diff --git a/src/printFormat/logisticLabel.js b/src/printFormat/logisticLabel.js index 1e2110c..83c15e6 100644 --- a/src/printFormat/logisticLabel.js +++ b/src/printFormat/logisticLabel.js @@ -13,18 +13,16 @@ const ckpLogo = 'iVBORw0KGgoAAAANSUhEUgAAAlkAAABxCAYAAADmmLY1AAAAAXNSR0IArs4c6QA for (let i = 0; i < printList.length; i++) { let row = printList[i] let direction = '' - let offsetX = 0 - let offsetY = 0 + let offsetX = row.offsetX; + let offsetY = row.offsetY; if (testFlag){ direction = row.direction - offsetX = row.offsetX - offsetY = row.offsetY } //如果打印正常的标签 LODOP.NewPageA(); LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - LODOP.SET_PRINT_PAGESIZE(direction === 'Vertical'?0:0,1100,512,""); + LODOP.SET_PRINT_PAGESIZE(direction === 'Vertical'?2:0,1100,512,""); LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(4,255,90,16,""); diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js index 9222c36..1a1d1ec 100644 --- a/src/printFormat/roll_label.js +++ b/src/printFormat/roll_label.js @@ -10,12 +10,10 @@ export const print_roll_label = (printList,printerName,testFlag = false)=>{ for (let i = 0; i < printList.length; i++) { let row = printList[i] let direction = '' - let offsetX = 0 - let offsetY = 0 + let offsetX = row.offsetX; + let offsetY = row.offsetY; if (testFlag){ direction = row.direction - offsetX = row.offsetX - offsetY = row.offsetY } //如果打印正常的标签 LODOP.NewPageA();