From d95f2831ddbacc3df5c1828b02f3b2a50787fbd4 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 26 Sep 2022 18:25:09 +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

---
 src/api/board.js                              |  3 +
 src/router/index.js                           |  3 +-
 .../modules/autoPrint/autoPrintStock.vue      | 31 ++++++++--
 .../modules/production/generateReport.vue     |  7 +--
 .../modules/production/print_seqNo_label.js   | 60 +++++++++++++++---
 .../modules/production/print_stock_label.js   | 22 -------
 .../modules/production/print_transNo_label.js | 62 ++++++++++++++++---
 .../modules/production/soscheduleRouting.vue  |  2 +-
 8 files changed, 142 insertions(+), 48 deletions(-)

diff --git a/src/api/board.js b/src/api/board.js
index 5a24d26..8daced1 100644
--- a/src/api/board.js
+++ b/src/api/board.js
@@ -9,3 +9,6 @@ export const soLiuhuaBoard= data => createAPI(`board/soLiuhuaBoard`,'post',data)
 
 export const transFerBoard= data => createAPI(`board/transFerBoard`,'post',data)
 export const SORoutingBoard= data => createAPI(`board/SORoutingBoard`,'post',data)
+
+export const getStockPrintList= data => createAPI(`board/getStockPrintList`,'post',data)
+export const updateStockPrintFlag= data => createAPI(`board/updateStockPrintFlag`,'post',data)
diff --git a/src/router/index.js b/src/router/index.js
index 2560534..bc82e4f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,7 +30,8 @@ const globalRoutes = [
   { path: '/padPart', component: _import('modules/pad/padPart1'), name: 'padPart1', meta: { title: '产品搜索' } },
   { path: '/padPartAttribute', component: _import('modules/pad/padPartAttribute'), name: 'padPartAttribute', meta: { title: '产品属性' } },
   { path: '/padPartPhoto', component: _import('modules/pad/padPartPhoto'), name: 'padPartPhoto', meta: { title: '产品图片' } },
-  { path: '/taskReport', component: _import('modules/taskmanage/taskReport'), name: 'taskReport', meta: { title: '任务看板' } }
+  { path: '/taskReport', component: _import('modules/taskmanage/taskReport'), name: 'taskReport', meta: { title: '任务看板' } },
+  { path: '/autoPrintStock', component: _import('modules/autoPrint/autoPrintStock'), name: 'autoPrintStock', meta: { title: '自动打印库存' } },
 
 ]
 
diff --git a/src/views/modules/autoPrint/autoPrintStock.vue b/src/views/modules/autoPrint/autoPrintStock.vue
index eb7da4d..b3d49d2 100644
--- a/src/views/modules/autoPrint/autoPrintStock.vue
+++ b/src/views/modules/autoPrint/autoPrintStock.vue
@@ -1,24 +1,27 @@
 <template>
   <div class="mod-config">
     <h1>自动打印库存标签</h1>
-
   </div>
 </template>
 
 <script>
   let autoPrint = '' //数据刷新定时器
   import {
-    productionBlankingBoard,
+    getStockPrintList,
+    updateStockPrintFlag
   } from '@/api/board.js'
+  import {
+    printMaterialLabel,
+  } from "@/views/modules/production/print_stock_label.js"
   export default {
-    name: 'productionBlankingBoard',
+    name: 'autoPrintStock',
     data () {
       return {
 
       }
     },
     mounted () {
-
+      this.refreshTable ()
     },
     methods: {
       refreshTable () {
@@ -27,7 +30,27 @@
         }, 3000)
       },
       printStock(){
+        getStockPrintList().then(({data}) => {
+          if (data.code == 0) {
+            let array=[];
+            if(data.rows.length>0){
+              for (let i = 0; i < data.rows.length; i++) {
+                array.push(data.rows[i])
+              }
+              printMaterialLabel(array);
+              for (let i = 0; i < data.rows.length; i++) {
+                let inData={
+                  transNo:data.rows[i].transNo,
+                  site:data.rows[i].site
+                }
+                updateStockPrintFlag(inData).then(({data}) => {
+
+                })
+              }
 
+            }
+          }
+        })
       },
     },
   }
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 0ba9856..4cd4c39 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -615,12 +615,9 @@
             this.$message.success(data.msg)
             this.setUp.reviewFlag = false
             this.search()
-            if(data.transNo!=null&&data.transNo!=""){
-              let indata={
-                transNo:data.transNo,
-              }
+            if(data.transData!=null){
               let inList=[];
-              inList.push(indata)
+              inList.push(data.transData)
               printTransNoLabel(inList);
             }
           } else {
diff --git a/src/views/modules/production/print_seqNo_label.js b/src/views/modules/production/print_seqNo_label.js
index 76d3636..844dab5 100644
--- a/src/views/modules/production/print_seqNo_label.js
+++ b/src/views/modules/production/print_seqNo_label.js
@@ -11,13 +11,59 @@ export function printSeqNoLabel(printList) {
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
       LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,300,200,"");
-      LODOP.ADD_PRINT_TEXT(52,21,72,35,"派工单号:"+printData.seqNo);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-      LODOP.ADD_PRINT_BARCODE(3,31,86,61,"QRCode",printData.seqNo);
+      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);
 
     }
     LODOP.PRINT_DESIGN();
diff --git a/src/views/modules/production/print_stock_label.js b/src/views/modules/production/print_stock_label.js
index 63fb8a4..c38ef0f 100644
--- a/src/views/modules/production/print_stock_label.js
+++ b/src/views/modules/production/print_stock_label.js
@@ -12,28 +12,6 @@ export function printMaterialLabel(printList) {
       let printData = printList[i];
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
-      // LODOP.ADD_PRINT_BARCODE(3,31,86,61,"QRCode",printData.seqNo);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"WareHouseId:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.wareHouseId);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"BatchNo:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.batchNo);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"LocationId:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.locationId);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"PartNo:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.partNo);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"OrderNo:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.orderNo);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"Qty:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.qty);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"TransDate:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,printData.transDate);
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"Manufactured by A&M Polymer");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"vender Code:");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
-      // LODOP.ADD_PRINT_TEXT(52,21,72,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
-      //
-      //
-
       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);
diff --git a/src/views/modules/production/print_transNo_label.js b/src/views/modules/production/print_transNo_label.js
index b44db12..6087d55 100644
--- a/src/views/modules/production/print_transNo_label.js
+++ b/src/views/modules/production/print_transNo_label.js
@@ -6,18 +6,64 @@ export function printTransNoLabel(printList) {
   if (LODOP) {
     //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", "");
     LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", "");
-    LODOP.SET_PRINTER_INDEXA("小标签打印机");
+    //LODOP.SET_PRINTER_INDEXA("小标签打印机");
     //循环调用打印机
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
       LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,1000,1000,"");
-      LODOP.ADD_PRINT_TEXT(52,21,72,35,"入库通知单号:"+printData.transNo);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-      LODOP.ADD_PRINT_BARCODE(3,31,86,61,"QRCode",printData.transNo);
+      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);
 
     }
     LODOP.PRINT_DESIGN();
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 2749f98..a5f7461 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -456,7 +456,7 @@
         let data={
             seqNo:row.seqNo,
         }
-        array.push(data)
+        array.push(row)
         printSeqNoLabel(array)
       },
     },