From cc7a21a5d00af538574987b60ec2a575980128a6 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 11 Aug 2023 09:48:04 +0800
Subject: [PATCH] 66

---
 src/views/modules/board/SORoutingBoard.vue       |  2 +-
 src/views/modules/board/shopOrderBoard.vue       |  8 ++++----
 .../modules/print/label/print_seqNo_label.js     | 12 ++++++------
 .../print/label/print_stock_label_preview.js     | 16 ++++++++--------
 src/views/modules/print/stockPrint.vue           |  4 ++--
 .../modules/schedule/scheduleForShopOrder.vue    |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue
index 76ea6a7..a836b35 100644
--- a/src/views/modules/board/SORoutingBoard.vue
+++ b/src/views/modules/board/SORoutingBoard.vue
@@ -50,7 +50,7 @@
           prop="sScheduledDate"
           header-align="center"
           align="left"
-          min-width="70"
+          min-width="50"
           label="派工日期">
         </el-table-column>
         <el-table-column
diff --git a/src/views/modules/board/shopOrderBoard.vue b/src/views/modules/board/shopOrderBoard.vue
index f092e5c..92dc87c 100644
--- a/src/views/modules/board/shopOrderBoard.vue
+++ b/src/views/modules/board/shopOrderBoard.vue
@@ -4,7 +4,7 @@
     <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >
 <!--    </div>-->
     <div style="text-align: center; ">
-      <h1>生产订单完成情况</h1>
+      <h1>生产订单周完成情况</h1>
     </div>
     <div class="board2">
       <!--        @mouseenter.native="mouseEnter"-->
@@ -25,11 +25,11 @@
           label="生产订单">
         </el-table-column>
         <el-table-column
-          prop="customerDesc"
+          prop="customerID"
           header-align="center"
           align="left"
-          min-width="130"
-          label="客户">
+          min-width="60"
+          label="客户编码">
         </el-table-column>
         <el-table-column
           prop="needDate"
diff --git a/src/views/modules/print/label/print_seqNo_label.js b/src/views/modules/print/label/print_seqNo_label.js
index ba00163..648d4aa 100644
--- a/src/views/modules/print/label/print_seqNo_label.js
+++ b/src/views/modules/print/label/print_seqNo_label.js
@@ -48,12 +48,12 @@ export function printSeqNoLabel(printList) {
       LODOP.ADD_PRINT_LINE(116,0,116,254,0,1);
       LODOP.ADD_PRINT_LINE(133,0,133,254,0,1);
       LODOP.ADD_PRINT_LINE(149,60,1,61,0,1);
-      LODOP.ADD_PRINT_TEXT(69,1,64,19,"名称规格：");
-      LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.ADD_PRINT_TEXT(69,62,133,19,printData.partDesc);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      // LODOP.ADD_PRINT_TEXT(69,1,64,19,"名称规格：");
+      // LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      // LODOP.ADD_PRINT_TEXT(69,62,133,19,printData.partDesc);
+      // LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(86,1,64,19,"客户编号：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
diff --git a/src/views/modules/print/label/print_stock_label_preview.js b/src/views/modules/print/label/print_stock_label_preview.js
index 527e4ab..2f46b03 100644
--- a/src/views/modules/print/label/print_stock_label_preview.js
+++ b/src/views/modules/print/label/print_stock_label_preview.js
@@ -25,16 +25,16 @@ export function printMaterialLabelPreview(printList) {
       LODOP.ADD_PRINT_TEXT(21,74,112,19,printData.partNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(40,1,76,19,"物料名称：");
+      LODOP.ADD_PRINT_TEXT(40,1,76,19,"日期：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(40,74,112,19,printData.partDesc);
+      LODOP.ADD_PRINT_TEXT(40,74,112,19,printData.manufactureDate);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(59,1,76,19,"规格型号：");
+      LODOP.ADD_PRINT_TEXT(59,1,76,19,"数量：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(59,74,112,19,printData.partSpec);
+      LODOP.ADD_PRINT_TEXT(59,74,112,19,printData.qty+' '+printData.umid);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_RECT(0,0,254,150,0,1);
@@ -59,16 +59,16 @@ export function printMaterialLabelPreview(printList) {
       LODOP.ADD_PRINT_TEXT(97,74,179,19,printData.locationId);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(116,1,76,19,"数量：");
+      LODOP.ADD_PRINT_TEXT(116,1,76,19,"规格型号：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(116,74,179,19,printData.qty+' '+printData.umid);
+      LODOP.ADD_PRINT_TEXT(116,74,179,19,printData.partSpec);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(134,1,76,19,"日期：");
+      LODOP.ADD_PRINT_TEXT(134,1,76,19,"物料名称：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(134,74,179,19,printData.manufactureDate);
+      LODOP.ADD_PRINT_TEXT(134,74,179,19,printData.partDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_LINE(76,186,1,187,0,1);
diff --git a/src/views/modules/print/stockPrint.vue b/src/views/modules/print/stockPrint.vue
index 05bac99..239d611 100644
--- a/src/views/modules/print/stockPrint.vue
+++ b/src/views/modules/print/stockPrint.vue
@@ -206,9 +206,9 @@
       printStock(row){
         let array=[];
         let data={
-          seqNo:row.site+'|'+row.partNo+'|'+row.wareHouseId+'|'+row.batchNo+'|'+row.locationId,
+          seqNo:row.site+'|'+row.partNo+'|'+row.warehouseID+'|'+row.batchNo+'|'+row.locationID,
           site:row.site,
-          wareHouseId:row.wareHouseId,
+          wareHouseId:row.warehouseID,
           batchNo:row.batchNo,
           locationId:row.locationID,
           partNo:row.partNo,
diff --git a/src/views/modules/schedule/scheduleForShopOrder.vue b/src/views/modules/schedule/scheduleForShopOrder.vue
index 5075f75..3e10599 100644
--- a/src/views/modules/schedule/scheduleForShopOrder.vue
+++ b/src/views/modules/schedule/scheduleForShopOrder.vue
@@ -610,7 +610,7 @@
           scheduleDate: '',
           scheduleQty: '',
           resourceId: '*',
-          shiftNo: '',
+          shiftNo: '白班',
           operatorId:'*',
           sumQty: 0,
           lastApproveQty:null,