From 915d8cd9b4fb144e6a5d9ed0475251e738ed41e1 Mon Sep 17 00:00:00 2001
From: yangzz <9704.yyds@163.com>
Date: Tue, 14 Jul 2026 09:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E7=BA=BF=E4=BA=A7=E5=93=81=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/printFormat/alphaHardTagPrintFormat.js | 86 +++++++++++-----------
 src/printFormat/antenna.js                 | 68 ++++++++---------
 src/printFormat/hardwareAntennaAutoSN.js   | 84 ++++++++++-----------
 3 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js
index cc9844d..67fffe6 100644
--- a/src/printFormat/alphaHardTagPrintFormat.js
+++ b/src/printFormat/alphaHardTagPrintFormat.js
@@ -334,7 +334,7 @@ const template1 = (LODOP,row) => {
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -393,7 +393,7 @@ const template2 = (LODOP,row) => {
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -469,7 +469,7 @@ const template3 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -572,7 +572,7 @@ const template4 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -671,7 +671,7 @@ const template5 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -779,7 +779,7 @@ const template6 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -890,7 +890,7 @@ const template7 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -1004,28 +1004,28 @@ const template7 = (LODOP,row)=>{
 
 
 const template8 = (LODOP,row)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+8,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+5,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+35,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+49,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+63,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1033,14 +1033,14 @@ const template8 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+4,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+15,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+25,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+95,4,142,20,"S/N:"+row.sn);
@@ -1123,28 +1123,28 @@ const template8 = (LODOP,row)=>{
 
 
 const template9 = (LODOP,row)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+11,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+8,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+8,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+69,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+38,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+52,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1152,24 +1152,24 @@ const template9 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+18,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+28,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
+  LODOP.ADD_PRINT_TEXT(sizeTop+95,4,142,20,"S/N:"+row.sn);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_BARCODE(sizeTop+83,1,160,20,'128B',row.sn);
+  LODOP.ADD_PRINT_BARCODE(sizeTop+76,1,160,20,'128B',row.sn);
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0)
-  LODOP.ADD_PRINT_IMAGE(sizeTop+104,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+100,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   if (row.pictureMap.P1) {
     LODOP.ADD_PRINT_IMAGE(sizeTop+122,7,102,16, `<img src="${row.pictureMap.P1}">`);
@@ -1242,28 +1242,28 @@ const template9 = (LODOP,row)=>{
 
 
 const template10 = (LODOP,row)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+8,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+5,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+35,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+49,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+63,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1271,24 +1271,24 @@ const template10 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+2,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+15,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+25,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
+  LODOP.ADD_PRINT_TEXT(sizeTop+95,4,142,20,"S/N:"+row.sn);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_BARCODE(sizeTop+83,1,160,20,'128B',row.sn);
+  LODOP.ADD_PRINT_BARCODE(sizeTop+76,1,160,20,'128B',row.sn);
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0)
-  LODOP.ADD_PRINT_IMAGE(sizeTop+105,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+100,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   if (row.pictureMap.P1){
     LODOP.ADD_PRINT_IMAGE(sizeTop+112,3,124,28,`<img src="${row.pictureMap.P1}">`);
diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js
index d1c0304..abf4a25 100644
--- a/src/printFormat/antenna.js
+++ b/src/printFormat/antenna.js
@@ -926,28 +926,28 @@ const template7 = (LODOP,row)=>{
 
 
 const template8 = (LODOP,row)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+8,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+5,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+35,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+49,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+63,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -955,24 +955,24 @@ const template8 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+4,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+15,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+25,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+95,4,142,20,"S/N:"+row.sn);
+  LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_BARCODE(sizeTop+76,1,160,20,'128B',row.sn);
+  LODOP.ADD_PRINT_BARCODE(sizeTop+83,1,160,20,'128B',row.sn);
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0)
-  LODOP.ADD_PRINT_IMAGE(sizeTop+100,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+105,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   if (row.pictureMap.P1) {
     LODOP.ADD_PRINT_IMAGE(sizeTop+109,3,124,28, `<img src="${row.pictureMap.P1}">`);
@@ -1045,28 +1045,28 @@ const template8 = (LODOP,row)=>{
 
 
 const template9 = (LODOP,row)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+11,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+8,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+8,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+69,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+38,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+52,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1074,14 +1074,14 @@ const template9 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+18,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+28,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
@@ -1091,7 +1091,7 @@ const template9 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_BARCODE(sizeTop+83,1,160,20,'128B',row.sn);
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0)
-  LODOP.ADD_PRINT_IMAGE(sizeTop+104,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+105,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   if (row.pictureMap.P1) {
     LODOP.ADD_PRINT_IMAGE(sizeTop+122,7,102,16, `<img src="${row.pictureMap.P1}">`);
@@ -1164,28 +1164,28 @@ const template9 = (LODOP,row)=>{
 
 
 const template10 = (LODOP,row)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+8,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+5,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,123,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+35,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+49,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+63,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1193,14 +1193,14 @@ const template10 = (LODOP,row)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+2,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+15,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+25,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
diff --git a/src/printFormat/hardwareAntennaAutoSN.js b/src/printFormat/hardwareAntennaAutoSN.js
index c1ff9d1..a0372a6 100644
--- a/src/printFormat/hardwareAntennaAutoSN.js
+++ b/src/printFormat/hardwareAntennaAutoSN.js
@@ -267,7 +267,7 @@ const template1 = (LODOP,row,sizeTop) => {
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -326,7 +326,7 @@ const template2 = (LODOP,row,sizeTop) => {
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -402,7 +402,7 @@ const template3 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -612,7 +612,7 @@ const template5 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -720,7 +720,7 @@ const template6 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -831,7 +831,7 @@ const template7 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
   LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
@@ -945,28 +945,28 @@ const template7 = (LODOP,row,sizeTop)=>{
 
 
 const template8 = (LODOP,row,sizeTop)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+8,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+5,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+35,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+49,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+63,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -974,24 +974,24 @@ const template8 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+4,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+15,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+25,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+95,4,142,20,"S/N:"+row.sn);
+  LODOP.ADD_PRINT_TEXT(sizeTop+103,4,142,20,"S/N:"+row.sn);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_BARCODE(sizeTop+76,1,160,20,'128B',row.sn);
+  LODOP.ADD_PRINT_BARCODE(sizeTop+83,1,160,20,'128B',row.sn);
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0)
-  LODOP.ADD_PRINT_IMAGE(sizeTop+100,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+105,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   if (row.pictureMap.P1) {
     LODOP.ADD_PRINT_IMAGE(sizeTop+109,3,124,28, `<img src="${row.pictureMap.P1}">`);
@@ -1064,28 +1064,28 @@ const template8 = (LODOP,row,sizeTop)=>{
 
 
 const template9 = (LODOP,row,sizeTop)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+11,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+8,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+8,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+69,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+38,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+52,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1093,24 +1093,24 @@ const template9 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+18,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+28,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
+  LODOP.ADD_PRINT_TEXT(sizeTop+103,4,142,20,"S/N:"+row.sn);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_BARCODE(sizeTop+83,1,160,20,'128B',row.sn);
   LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0)
-  LODOP.ADD_PRINT_IMAGE(sizeTop+104,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+105,126,23,33,"<img src=\"data:image/png;base64," + ljtIcon + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   if (row.pictureMap.P1) {
     LODOP.ADD_PRINT_IMAGE(sizeTop+122,7,102,16, `<img src="${row.pictureMap.P1}">`);
@@ -1183,28 +1183,28 @@ const template9 = (LODOP,row,sizeTop)=>{
 
 
 const template10 = (LODOP,row,sizeTop)=>{
-  LODOP.ADD_PRINT_IMAGE(sizeTop+8,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
+  LODOP.ADD_PRINT_IMAGE(sizeTop+13,7,120,24,"<img src=\"data:image/png;base64," + labelLogo + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
   LODOP.ADD_PRINT_IMAGE(sizeTop+9,25,6,7,"<img src=\"data:image/png;base64," + logoR + "\"/>");
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+5,104,52,16,row.dateStr);
+  LODOP.ADD_PRINT_TEXT(sizeTop+10,104,52,16,row.dateStr);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-  LODOP.ADD_PRINT_RECT(sizeTop+5,108,46,30,0,1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+66,125,39,12,"REV"+row.productRev);
+  LODOP.ADD_PRINT_RECT(sizeTop+10,108,46,30,0,1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+71,125,44,12,"REV"+row.productRev);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+35,6,145,13,row.printStr1);
+  LODOP.ADD_PRINT_TEXT(sizeTop+40,6,145,13,row.printStr1);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+49,6,145,12,row.printStr2);
+  LODOP.ADD_PRINT_TEXT(sizeTop+54,6,145,12,row.printStr2);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
-  LODOP.ADD_PRINT_TEXT(sizeTop+63,6,80,12,row.printStr3);
+  LODOP.ADD_PRINT_TEXT(sizeTop+68,6,80,12,row.printStr3);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-4);
@@ -1212,17 +1212,17 @@ const template10 = (LODOP,row,sizeTop)=>{
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-  LODOP.ADD_PRINT_TEXT(sizeTop+2,166,197,12,"No user serviceable parts.");
+  LODOP.ADD_PRINT_TEXT(sizeTop+7,166,197,12,"No user serviceable parts.");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-  LODOP.ADD_PRINT_TEXT(sizeTop+15,112,51,16,"MADE IN");
+  LODOP.ADD_PRINT_TEXT(sizeTop+20,112,51,16,"MADE IN");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+25,116,40,16,"CHINA");
+  LODOP.ADD_PRINT_TEXT(sizeTop+30,116,40,16,"CHINA");
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-  LODOP.ADD_PRINT_TEXT(sizeTop+102,4,142,20,"S/N:"+row.sn);
+  LODOP.ADD_PRINT_TEXT(sizeTop+103,4,142,20,"S/N:"+row.sn);
   LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
   LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
   LODOP.SET_PRINT_STYLEA(0,"Bold",1);