From 5b0417994966581b55cb549993f03d2d576e8918 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 9 Feb 2023 18:13:31 +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

---
 .../board/SORoutingBoardForShuiZhu.vue        | 13 +++--
 src/views/modules/print/print_liuhua_card.js  |  4 +-
 src/views/modules/print/print_outBox_label.js | 50 +++++++++++--------
 .../modules/print/print_package_label.js      |  7 +--
 4 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/board/SORoutingBoardForShuiZhu.vue b/src/views/modules/board/SORoutingBoardForShuiZhu.vue
index d7ef49c..b144cc6 100644
--- a/src/views/modules/board/SORoutingBoardForShuiZhu.vue
+++ b/src/views/modules/board/SORoutingBoardForShuiZhu.vue
@@ -18,7 +18,7 @@
           prop="site"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="20"
           style="font-size: 20px"
           label="工厂">
         </el-table-column>
@@ -49,14 +49,14 @@
           prop="partNo"
           header-align="center"
           align="left"
-          min-width="45"
+          min-width="40"
           label="产品编号">
         </el-table-column>
         <el-table-column
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="70"
+          min-width="60"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -87,6 +87,13 @@
           min-width="50"
           label="工艺备注-烘烤">
         </el-table-column>
+        <el-table-column
+          prop="text3"
+          header-align="center"
+          align="left"
+          min-width="35"
+          label="材料类别">
+        </el-table-column>
         <el-table-column
           prop="lastApproveQty"
           header-align="center"
diff --git a/src/views/modules/print/print_liuhua_card.js b/src/views/modules/print/print_liuhua_card.js
index 921ae55..8fb6e13 100644
--- a/src/views/modules/print/print_liuhua_card.js
+++ b/src/views/modules/print/print_liuhua_card.js
@@ -80,7 +80,7 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(39,379,60,25,"班次:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(40,539,100,25,"混炼胶批次号");
+      LODOP.ADD_PRINT_TEXT(40,539,100,25,"模具交接签字");
       LODOP.ADD_PRINT_TEXT(62,3,80,20,"操作员:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(63,202,75,25,"产品型号:");
@@ -227,7 +227,7 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(39,463,75,20,printData.S_ShiftNo);//班次
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(39,616,110,25,"11混炼胶批次号");//混炼胶批次号
+      // LODOP.ADD_PRINT_TEXT(39,616,110,25,"11模具交接签字");//模具交接签字
       // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(62,83,100,20,printData.OperatorDesc);//操作员
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js
index f2824a8..4542380 100644
--- a/src/views/modules/print/print_outBox_label.js
+++ b/src/views/modules/print/print_outBox_label.js
@@ -14,8 +14,8 @@ export function printOutBoxLabel(printList) {
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
       LODOP.ADD_PRINT_RECT(60,5,551,270,0,1);
-      LODOP.ADD_PRINT_TEXT(6,35,496,40,printData.siteName );
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.ADD_PRINT_TEXT(3,35,496,50,printData.siteName );
+      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial Black");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",24);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -36,13 +36,13 @@ export function printOutBoxLabel(printList) {
       LODOP.ADD_PRINT_LINE(120,57,60,58,0,1);
       LODOP.ADD_PRINT_LINE(120,248,60,249,0,1);
       LODOP.ADD_PRINT_LINE(120,368,60,369,0,1);
-      LODOP.ADD_PRINT_LINE(330,184,240,185,0,1);
+      LODOP.ADD_PRINT_LINE(330,234,240,235,0,1);
       LODOP.ADD_PRINT_LINE(240,136,120,137,0,1);
       LODOP.ADD_PRINT_LINE(90,476,60,477,0,1);
       LODOP.ADD_PRINT_LINE(120,449,90,450,0,1);
-      LODOP.ADD_PRINT_LINE(180,449,150,450,0,1);
+      LODOP.ADD_PRINT_LINE(180,436,150,437,0,1);
       LODOP.ADD_PRINT_LINE(330,57,300,58,0,1);
-      LODOP.ADD_PRINT_LINE(330,248,300,249,0,1);
+      LODOP.ADD_PRINT_LINE(330,290,300,291,0,1);
       LODOP.ADD_PRINT_LINE(330,435,300,436,0,1);
       LODOP.ADD_PRINT_TEXT(67,15,47,24,"P/N:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
@@ -88,7 +88,7 @@ export function printOutBoxLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(307,193,58,25,"Q.T.Y");
+      LODOP.ADD_PRINT_TEXT(307,237,58,25,"Q.T.Y");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",13);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -116,10 +116,10 @@ export function printOutBoxLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(97,254,120,25,printData.unitQty);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      // LODOP.ADD_PRINT_TEXT(307,304,70,25,printData.unitQty);
+      // LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      // LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(126,137,421,25,printData.partDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
@@ -144,40 +144,50 @@ export function printOutBoxLabel(printList) {
       }
       if(printData.code=='CODE128') {
         LODOP.ADD_PRINT_BARCODE(189,146,224,46,"128A",printData.batchNo);
-        LODOP.ADD_PRINT_BARCODE(245,12,165,55,"128A",printData.partSpec);
+        LODOP.ADD_PRINT_BARCODE(248,13,214,46,"128A",printData.partSpec);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
-        LODOP.ADD_PRINT_BARCODE(243,195,165,51,"128A",printData.unitQty);
+        LODOP.ADD_PRINT_BARCODE(248,240,120,46,"128A",printData.unitQty);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
-        LODOP.ADD_PRINT_BARCODE(247,376,169,45,"128A",printData.customerPONo);
+        LODOP.ADD_PRINT_BARCODE(248,376,169,46,"128A",printData.customerPONo);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
       }else {
         LODOP.ADD_PRINT_BARCODE(189,146,219,46,"Code39",printData.batchNo);
-        LODOP.ADD_PRINT_BARCODE(245,12,165,55,"Code39",printData.partSpec);
+        LODOP.ADD_PRINT_BARCODE(248,13,214,46,"Code39",printData.partSpec);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
-        LODOP.ADD_PRINT_BARCODE(243,195,165,51,"Code39",printData.unitQty);
+        LODOP.ADD_PRINT_BARCODE(248,240,120,46,"Code39",printData.unitQty);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
-        LODOP.ADD_PRINT_BARCODE(247,376,169,45,"Code39",printData.customerPONo);
+        LODOP.ADD_PRINT_BARCODE(248,376,169,46,"Code39",printData.customerPONo);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
       }
       LODOP.ADD_PRINT_TEXT(307,64,120,25,printData.partSpec);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(307,253,116,25,printData.unitQty);
+      LODOP.ADD_PRINT_TEXT(307,304,70,25,printData.unitQty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(307,436,116,25,printData.customerPONo);
+      LODOP.ADD_PRINT_TEXT(307,436,121,25,printData.customerPONo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(333,11,269,20,"Manufactured by A&M Polymer");
+      LODOP.ADD_PRINT_TEXT(333,11,540,20,"Manufactured by "+ printData.siteName);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      // LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(348,11,548,35,printData.siteDetail);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
 
+      LODOP.ADD_PRINT_TEXT(157,370,65,25,printData.hARDNESS);
+      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(157,438,121,25,printData.cOLOR);
+      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
     }
     LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
diff --git a/src/views/modules/print/print_package_label.js b/src/views/modules/print/print_package_label.js
index dd98f13..21344db 100644
--- a/src/views/modules/print/print_package_label.js
+++ b/src/views/modules/print/print_package_label.js
@@ -17,7 +17,7 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(93,141,241,25,printData.partSpec);
+      LODOP.ADD_PRINT_TEXT(94,141,241,25,printData.partSpec);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -45,14 +45,15 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(69,18,121,25,"Product Desc:");
+      LODOP.ADD_PRINT_TEXT(67,18,121,25,"Product Desc:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(69,141,243,24,printData.partDesc);
+      LODOP.ADD_PRINT_TEXT(67,141,243,24,printData.partDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
       LODOP.ADD_PRINT_TEXT(180,18,128,25,"MFG Date:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);