From 2d0e14ac04228e2499910841b52d6cc63c335591 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 25 May 2022 17:51:01 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-25=20=E6=A0=87=E7=AD=BE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=E6=96=B0=E5=A2=9E=E4=BF=A9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue |  2 +-
 .../modules/yieldReport/print_roll_label.js   | 29 +++++++-------
 .../modules/yieldReport/produce_order.vue     | 38 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 29d76d1..c933111 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -462,7 +462,7 @@
                 v-model="popoverFlag"
                 trigger="click">
                 <div style="text-align: right; margin: 0;width: 120px;">
-                  <el-button type="primary" v-if="this.preItemNo <= 0" @click="finishPartRollModal"
+                  <el-button type="primary" v-if="this.scheduleData.preItemNo <= 0" @click="finishPartRollModal"
                              style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">
                     产量报告
                   </el-button>
diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js
index b1c47d6..00afef0 100644
--- a/src/views/modules/yieldReport/print_roll_label.js
+++ b/src/views/modules/yieldReport/print_roll_label.js
@@ -84,13 +84,14 @@ export function printSfdcLabel(printList) {
       LODOP.ADD_PRINT_LINE(105,5,106,254,0,1);
       LODOP.ADD_PRINT_LINE(120,5,121,254,0,1);
       LODOP.ADD_PRINT_LINE(135,5,136,254,0,1);
-      LODOP.ADD_PRINT_LINE(150,5,151,185,0,1);
-      LODOP.ADD_PRINT_LINE(173,5,174,185,0,1);
-      LODOP.ADD_PRINT_LINE(189,5,188,185,0,1);
+      LODOP.ADD_PRINT_LINE(152,5,153,185,0,1);
+      LODOP.ADD_PRINT_LINE(169,5,170,185,0,1);
+      LODOP.ADD_PRINT_LINE(187,5,186,185,0,1);
       LODOP.ADD_PRINT_LINE(203,5,204,254,0,1);
-      LODOP.ADD_PRINT_LINE(203,5,5,6,0,1);
-      LODOP.ADD_PRINT_LINE(203,254,5,255,0,1);
-      LODOP.ADD_PRINT_LINE(173,65,25,66,0,1);
+      LODOP.ADD_PRINT_LINE(218,6,219,255,0,1);
+      LODOP.ADD_PRINT_LINE(218,5,5,6,0,1);
+      LODOP.ADD_PRINT_LINE(218,254,5,255,0,1);
+      LODOP.ADD_PRINT_LINE(185,65,25,66,0,1);
       LODOP.ADD_PRINT_LINE(203,186,136,187,0,1);
       //区分判断 显示不同的表
       if (printData.nextItemDesc === '仓库'){
@@ -108,8 +109,9 @@ export function printSfdcLabel(printList) {
       LODOP.ADD_PRINT_TEXT(107,7,60,15,"客户名称");
       LODOP.ADD_PRINT_TEXT(123,7,60,17,"创建人/日期");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-      LODOP.ADD_PRINT_TEXT(137,7,60,15,"数量");
-      LODOP.ADD_PRINT_TEXT(154,7,65,15,"工序/下道");
+      LODOP.ADD_PRINT_TEXT(138,7,60,15,"数量");
+      LODOP.ADD_PRINT_TEXT(154,7,50,15,"工序");
+      LODOP.ADD_PRINT_TEXT(172,7,47,20,"下道");
       LODOP.ADD_PRINT_TEXT(27,120,100,15, printData.rollNo);
       LODOP.ADD_PRINT_TEXT(42,115,100,15, printData.partNo);
       LODOP.ADD_PRINT_TEXT(55,70,185,35, printData.partDesc);
@@ -118,17 +120,16 @@ export function printSfdcLabel(printList) {
       LODOP.ADD_PRINT_TEXT(122,70,45,15, printData.createdBy);
       LODOP.ADD_PRINT_TEXT(122,135,130,15, printData.createdDate);
       LODOP.ADD_PRINT_TEXT(137,79,50,15, printData.rollQty);
-      LODOP.ADD_PRINT_TEXT(150,70,55,20, printData.itemDesc);
+      LODOP.ADD_PRINT_TEXT(155,70,115,15, printData.itemDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.ADD_PRINT_TEXT(157,140,50,20, printData.nextItemDesc);
+      LODOP.ADD_PRINT_TEXT(171,70,115,15, printData.nextItemDesc);
       LODOP.ADD_PRINT_BARCODE(138,188,100,75,"QRCode", printData.rollNo);
-      LODOP.ADD_PRINT_TEXT(204,8,100,20,"融新标签");
       if (printData.customerName === '伊连特' && printData.customerName != ''){
-        LODOP.ADD_PRINT_IMAGE(173,10,23,15.5, "<img src='/static/img/sfdc_ul.jpg'/>");
+        LODOP.ADD_PRINT_IMAGE(187,10,23,16, "<img src='/static/img/sfdc_ul.jpg'/>");
         LODOP.SET_PRINT_STYLEA(0, "Stretch", 1);//(不变形)原比例扩展缩放模式
         //设置
-        LODOP.ADD_PRINT_TEXT(175,50, 100,20, printData.ul);
-        LODOP.ADD_PRINT_TEXT(190,7, 120, 15, "Factory ID: YR");
+        LODOP.ADD_PRINT_TEXT(188,50,100,20, printData.ul);
+        LODOP.ADD_PRINT_TEXT(205,11, 120, 15, "Factory ID: YR");
       }
     }
     //LODOP.PRINT_DESIGN();
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 382ccc7..023a460 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1036,7 +1036,43 @@ export default {
           sortLv: 0,
           status: true,
           fixed: false
-        }
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreResourceInfo',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "preResourceInfo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "上工序机台信息",
+          columnWidth: 120,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreQtyFinished',
+          tableId: "5302Produce",
+          tableName: "待生产工单",
+          columnProp: "preQtyFinished",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "上工序完工数",
+          columnWidth: 120,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
       ],
       menuButton: {
         prdButton: true,