From 6f34f853b1c795870e7ec74ad99bfca8140207c4 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 8 Sep 2023 10:12:03 +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/views/modules/print/print_outBox_label.js |  8 ++++++--
 src/views/modules/production/dailyPlan.vue    | 13 +++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js
index 16e69d5..dfa9232 100644
--- a/src/views/modules/print/print_outBox_label.js
+++ b/src/views/modules/print/print_outBox_label.js
@@ -147,7 +147,9 @@ export function printOutBoxLabel(printList) {
       }
       if(printData.code=='CODE128') {
         LODOP.ADD_PRINT_BARCODE(189,146,224,46,"128A",printData.customerPONo);
-        LODOP.ADD_PRINT_BARCODE(189,373,180,46,"128A",printData.contractNo);
+        if(printData.contractNo!=''&&printData.contractNo!=null){
+          LODOP.ADD_PRINT_BARCODE(189,373,180,46,"128A",printData.contractNo);
+        }
         LODOP.ADD_PRINT_BARCODE(248,13,214,46,"128A",printData.partSpec);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
         LODOP.ADD_PRINT_BARCODE(248,240,120,46,"128A",printData.unitQty);
@@ -156,7 +158,9 @@ export function printOutBoxLabel(printList) {
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
       }else {
         LODOP.ADD_PRINT_BARCODE(189,146,219,46,"Code39",printData.customerPONo);
-        LODOP.ADD_PRINT_BARCODE(189,373,180,46,"Code39",printData.contractNo);
+        if(printData.contractNo!=''&&printData.contractNo!=null){
+          LODOP.ADD_PRINT_BARCODE(189,373,180,46,"Code39",printData.contractNo);
+        }
         LODOP.ADD_PRINT_BARCODE(248,13,214,46,"Code39",printData.partSpec);
         LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
         LODOP.ADD_PRINT_BARCODE(248,240,120,46,"Code39",printData.unitQty);
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index f3b00ff..45194d3 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -515,7 +515,7 @@
           })
           return false
         }
-        let list = {orderNo: row.orderNo}
+        let list = {site:row.site,orderNo: row.orderNo}
         getSchedulingSize(list).then(({data}) => {
           this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
           this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
@@ -531,7 +531,7 @@
         this.scheduledModelData.planStartDate = row.planStartDate
         this.scheduledModelData.orderNo = row.orderNo
         this.schedulingFlag = true
-        let data1 = {orderNo: row.orderNo}
+        let data1 = {site:row.site,orderNo: row.orderNo}
         getWorkPlanData(data1).then(({data}) => {
           this.scheduleTableData = data.rows
         })
@@ -568,7 +568,7 @@
             this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1);
             this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1))
             this.schedulingModalFlag = false
-            let data1 = {orderNo: this.scheduledModelData.orderNo}
+            let data1 = {site:this.scheduledModelData.site,orderNo: this.scheduledModelData.orderNo}
             getWorkPlanData(data1).then(({data}) => {
               this.scheduleTableData = data.rows
             })
@@ -656,7 +656,7 @@
             this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
             this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1))
             this.schedulingsFlag = false
-            let data1 = {orderNo: this.scheduledModelData.orderNo}
+            let data1 = {site:this.scheduledModelData.site,orderNo: this.scheduledModelData.orderNo}
             getWorkPlanData(data1).then(({data}) => {
               this.scheduleTableData = data.rows
 
@@ -702,7 +702,7 @@
           if (data && data.code === 0) {
             this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1);
             this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1));
-            let data1 = {orderNo: this.scheduledModelData.orderNo}
+            let data1 = {site:this.scheduledModelData.site,orderNo: this.scheduledModelData.orderNo}
             getWorkPlanData(data1).then(({data}) => {
               this.scheduleTableData = data.rows
             })
@@ -740,6 +740,7 @@
       // 刪除
       deleteSchedule (row) {
         let delData = {
+          site:row.site,
           orderNo: row.orderNo,
           orderQty: row.orderQty,
           orderRef1: row.orderRef1
@@ -755,7 +756,7 @@
               this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
               this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1));
               this.getData()
-              let data1 = {orderNo: this.scheduledModelData.orderNo}
+              let data1 = {site:this.scheduledModelData.site,orderNo: this.scheduledModelData.orderNo}
               getWorkPlanData(data1).then(({data}) => {
                 this.scheduleTableData = data.rows
               })