From fda9f66d9da28211ff4f95d5c02a405953b9af0d Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 7 Oct 2022 18:43:04 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/print_seqNo_label.js   | 99 ++++++++++++++-----
 .../modules/production/print_stock_label.js   | 98 +++++++++++++-----
 .../modules/production/print_transNo_label.js | 99 ++++++++++++++-----
 .../production/scheduleForShopOrder.vue       |  7 ++
 4 files changed, 233 insertions(+), 70 deletions(-)

diff --git a/src/views/modules/production/print_seqNo_label.js b/src/views/modules/production/print_seqNo_label.js
index 844dab5..9a1e2db 100644
--- a/src/views/modules/production/print_seqNo_label.js
+++ b/src/views/modules/production/print_seqNo_label.js
@@ -12,59 +12,58 @@ export function printSeqNoLabel(printList) {
       let printData = printList[i];
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
-      LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo);
-      LODOP.ADD_PRINT_TEXT(58,8,108,25,"PartNo:");
+      LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.partNo);
+      LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.partNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(111,8,128,24,"Operator:");
+      LODOP.ADD_PRINT_TEXT(143,8,128,24,"Operator:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.operatorName);
+      LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.operatorName);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(84,8,113,25,"Shift:");
+      LODOP.ADD_PRINT_TEXT(116,8,113,25,"Shift:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.sShiftNo);
+      LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.sShiftNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(9,8,98,25,"SeqNo:");
+      LODOP.ADD_PRINT_TEXT(41,8,98,25,"Job No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.seqNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,8,94,25,"OrderNo:");
+      LODOP.ADD_PRINT_TEXT(168,8,94,25,"Order No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+      LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(34,8,96,25,"Qty:");
+      LODOP.ADD_PRINT_TEXT(66,8,96,25,"Qty:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qtyRequired);
+      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(162,8,128,25,"ScheduledDate:");
+      LODOP.ADD_PRINT_TEXT(194,8,128,25,"Work Date:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.sScheduledDate);
+      LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.sScheduledDate);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+      LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+      LODOP.ADD_PRINT_TEXT(224,259,109,25,"vender Code:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
-
+      LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+      LODOP.ADD_PRINT_TEXT(12,122,135,30,"派工单标签");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     LODOP.PRINT_DESIGN();
     //LODOP.PREVIEW();
@@ -73,3 +72,57 @@ export function printSeqNoLabel(printList) {
   }
 }
 
+// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo);
+// LODOP.ADD_PRINT_TEXT(58,8,108,25,"PartNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.partNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,8,128,24,"Operator:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.operatorName);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,8,113,25,"Shift:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.sShiftNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,8,98,25,"SeqNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.seqNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,8,94,25,"OrderNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,8,96,25,"Qty:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qtyRequired);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,8,128,25,"ScheduledDate:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.sScheduledDate);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
+
diff --git a/src/views/modules/production/print_stock_label.js b/src/views/modules/production/print_stock_label.js
index c38ef0f..7428743 100644
--- a/src/views/modules/production/print_stock_label.js
+++ b/src/views/modules/production/print_stock_label.js
@@ -12,58 +12,57 @@ export function printMaterialLabel(printList) {
       let printData = printList[i];
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
-      LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo);
-      LODOP.ADD_PRINT_TEXT(58,8,108,25,"WareHouseId:");
+      LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(90,8,133,25,"WareHouse Id:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.wareHouseId);
+      LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.wareHouseId);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(111,8,77,24,"BatchNo:");
+      LODOP.ADD_PRINT_TEXT(143,8,103,24,"Batch No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.batchNo);
+      LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.batchNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(84,8,98,25,"LocationId:");
+      LODOP.ADD_PRINT_TEXT(116,8,124,25,"Location Id:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.locationId);
+      LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.locationId);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(9,8,72,25,"PartNo:");
+      LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.partNo);
+      LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.partNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,8,82,25,"OrderNo:");
+      LODOP.ADD_PRINT_TEXT(168,8,82,25,"Order No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+      LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(34,8,56,25,"Qty:");
+      LODOP.ADD_PRINT_TEXT(66,8,56,25,"Qty:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qty);
+      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(162,8,92,25,"TransDate:");
+      LODOP.ADD_PRINT_TEXT(194,8,92,25,"TransDate:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+      LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.transDate);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+      LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
+      LODOP.ADD_PRINT_TEXT(224,259,109,25,"vender Code:");
+      LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+      LODOP.ADD_PRINT_TEXT(9,140,100,30,"库存标签");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     LODOP.PRINT_DESIGN();
     //LODOP.PREVIEW();
@@ -72,3 +71,56 @@ export function printMaterialLabel(printList) {
   }
 }
 
+// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo);
+// LODOP.ADD_PRINT_TEXT(58,8,108,25,"WareHouseId:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.wareHouseId);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,8,77,24,"BatchNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.batchNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,8,98,25,"LocationId:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.locationId);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,8,72,25,"PartNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.partNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,8,82,25,"OrderNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,8,56,25,"Qty:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qty);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,8,92,25,"TransDate:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
diff --git a/src/views/modules/production/print_transNo_label.js b/src/views/modules/production/print_transNo_label.js
index 6087d55..4357291 100644
--- a/src/views/modules/production/print_transNo_label.js
+++ b/src/views/modules/production/print_transNo_label.js
@@ -12,59 +12,58 @@ export function printTransNoLabel(printList) {
       let printData = printList[i];
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
-      LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.transNo);
-      LODOP.ADD_PRINT_TEXT(58,8,108,25,"PartNo:");
+      LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.transNo);
+      LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.partNo);
+      LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.partNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(111,8,77,24,"SeqNo:");
+      LODOP.ADD_PRINT_TEXT(143,8,77,24,"Job No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.seqNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(84,8,113,25,"WorkCenterNo:");
+      LODOP.ADD_PRINT_TEXT(116,8,113,25,"WorkCenterNo:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.workCenterNo);
+      LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.workCenterNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(9,8,98,25,"TransNo:");
+      LODOP.ADD_PRINT_TEXT(41,8,98,25,"Trans No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.transNo);
+      LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.transNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,8,94,25,"OrderNo:");
+      LODOP.ADD_PRINT_TEXT(168,8,94,25,"Order No:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+      LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(34,8,96,25,"TransQty:");
+      LODOP.ADD_PRINT_TEXT(66,8,96,25,"TransQty:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.transQty);
+      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.transQty);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(162,8,97,25,"TransDate:");
+      LODOP.ADD_PRINT_TEXT(194,8,97,25,"TransDate:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+      LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.transDate);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+      LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+      LODOP.ADD_PRINT_TEXT(224,259,109,25,"vender Code:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
-
+      LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+      LODOP.ADD_PRINT_TEXT(12,122,135,30,"入库通知单");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     LODOP.PRINT_DESIGN();
     //LODOP.PREVIEW();
@@ -72,4 +71,56 @@ export function printTransNoLabel(printList) {
     console.log("操作成功！")
   }
 }
-
+// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.transNo);
+// LODOP.ADD_PRINT_TEXT(58,8,108,25,"PartNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.partNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,8,77,24,"SeqNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.seqNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,8,113,25,"WorkCenterNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.workCenterNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,8,98,25,"TransNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.transNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,8,94,25,"OrderNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,8,96,25,"TransQty:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.transQty);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,8,97,25,"TransDate:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index da46b98..02da8ed 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -196,6 +196,13 @@
         width="80"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="lastApproveQty"
+        header-align="center"
+        align="right"
+        width="80"
+        label="上工序完成数量">
+      </el-table-column>
       <el-table-column
         prop="scheduledQty"
         header-align="center"