diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js index f89c5f5..dbbe005 100644 --- a/src/printFormat/RF_RFID.js +++ b/src/printFormat/RF_RFID.js @@ -53,14 +53,17 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => { LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.ADD_PRINT_LINE(100,-2,99,406,0,1); LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1); - LODOP.ADD_PRINT_TEXT(104,25,151,20,"ROLL COUNT"); + + LODOP.ADD_PRINT_TEXT(105,25,151,20,"ROLL COUNT"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); - LODOP.ADD_PRINT_TEXT(121,25,150,20,"MANUFACTURE DATE"); + LODOP.ADD_PRINT_TEXT(105,202,100,20,row.rollCount); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); - LODOP.ADD_PRINT_TEXT(123,202,100,20,row.date); + + LODOP.ADD_PRINT_TEXT(125,25,150,20,"MANUFACTURE DATE"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); - LODOP.ADD_PRINT_TEXT(104,202,100,20,row.rollCount); + LODOP.ADD_PRINT_TEXT(125,202,100,20,row.date); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); + if(rightIndex === 'Y'){ LODOP.ADD_PRINT_TEXT(152,255,180,20,row.freeInfo2); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js index c64f161..891b176 100644 --- a/src/printFormat/alphaHardTagPrintFormat.js +++ b/src/printFormat/alphaHardTagPrintFormat.js @@ -60,44 +60,47 @@ export function printAlphaHardTagLabel (printList, icons, printerName) { LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.ADD_PRINT_LINE(86,-2,85,406,0,1); LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1); - LODOP.ADD_PRINT_TEXT(128,25,151,20,"MANUFACTURE DATE"); - LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); - LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(114,25,150,20,"S/N"); + + LODOP.ADD_PRINT_TEXT(116,25,150,20,"S/N"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(114,176,194,20,row.sn); + LODOP.ADD_PRINT_TEXT(116,176,194,20,row.sn); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8) - LODOP.ADD_PRINT_TEXT(128,176,190,20,row.date); + + LODOP.ADD_PRINT_TEXT(130,25,151,20,"MANUFACTURE DATE"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(85,25,151,20,"MANUFACTURER"); + LODOP.ADD_PRINT_TEXT(130,176,190,20,row.date); + LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",8); + + LODOP.ADD_PRINT_TEXT(88,25,151,20,"MANUFACTURER"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(85,176,190,20,row.manufacturer); + LODOP.ADD_PRINT_TEXT(88,176,190,20,row.manufacturer); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); if (row.weightUmName && row.weight){ - LODOP.ADD_PRINT_TEXT(85,250,50,20,"WEIGHT"); + LODOP.ADD_PRINT_TEXT(88,250,50,20,"WEIGHT"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(85,275,60,20,row.weight); + LODOP.ADD_PRINT_TEXT(88,275,60,20,row.weight); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); LODOP.SET_PRINT_STYLEA(0,"Alignment",3); - LODOP.ADD_PRINT_TEXT(85,341,50,20,row.weightUmName); + LODOP.ADD_PRINT_TEXT(88,341,50,20,row.weightUmName); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); } - LODOP.ADD_PRINT_TEXT(99,25,151,20,"MOLD CODE"); + LODOP.ADD_PRINT_TEXT(101,25,151,20,"MOLD CODE"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); - LODOP.ADD_PRINT_TEXT(99,176,189,20,row.moldCode); + LODOP.ADD_PRINT_TEXT(101,176,189,20,row.moldCode); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",8); if(rightIndex === 'Y'){ diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js index 0fdcffa..47cf165 100644 --- a/src/printFormat/antenna.js +++ b/src/printFormat/antenna.js @@ -53,17 +53,20 @@ export const printAntennaLabel = (printList, icons, printerName) => { LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.ADD_PRINT_LINE(92, -2, 91, 406, 0, 1) LODOP.ADD_PRINT_LINE(146, -2, 145, 406, 0, 1) - LODOP.ADD_PRINT_TEXT(93, 25, 151, 20, 'PRODUCT REV.') + + LODOP.ADD_PRINT_TEXT(96, 25, 151, 20, 'PRODUCT REV.') LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') - LODOP.ADD_PRINT_TEXT(110, 25, 150, 20, 'MANUFACTURE DATE') + LODOP.ADD_PRINT_TEXT(96, 177, 180, 20, row.productRev) LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') - LODOP.ADD_PRINT_TEXT(112, 177, 180, 20, row.date) + + LODOP.ADD_PRINT_TEXT(128, 24, 150, 20, 'S/N') LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') - LODOP.ADD_PRINT_TEXT(93, 177, 180, 20, row.productRev) + LODOP.ADD_PRINT_TEXT(128, 176, 180, 20, row.sn) LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') - LODOP.ADD_PRINT_TEXT(126, 24, 150, 20, 'S/N') + + LODOP.ADD_PRINT_TEXT(112, 25, 150, 20, 'MANUFACTURE DATE') LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') - LODOP.ADD_PRINT_TEXT(128, 176, 180, 20, row.sn) + LODOP.ADD_PRINT_TEXT(112, 177, 180, 20, row.date) LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') if (rightIndex === 'Y') { LODOP.ADD_PRINT_TEXT(152, 255, 180, 20, row.freeInfo2)