From 77ba5cf31680e707c199a1a79d07bcc46ebaeb08 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 25 Aug 2023 15:34:47 +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

---
 .../modules/print/print_package_label.js      |  2 +-
 .../modules/production/closeSchedule.vue      | 25 ++++++++++++++++
 .../modules/production/generateReport.vue     | 25 ++++++++++++++++
 .../modules/production/soscheduleRouting.vue  | 29 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/print/print_package_label.js b/src/views/modules/print/print_package_label.js
index 21344db..6f36ab1 100644
--- a/src/views/modules/print/print_package_label.js
+++ b/src/views/modules/print/print_package_label.js
@@ -79,7 +79,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(217,243,100,20,"Vendor I.D.:");
+      LODOP.ADD_PRINT_TEXT(217,243,130,20,"Vendor I.D.:"+printData.siteName);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
       LODOP.ADD_PRINT_TEXT(228,18,348,30,printData.siteAdress);
diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index a8ba9e2..a9f4689 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -7,6 +7,9 @@
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" type="number" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
         <el-input v-model="searchData.sWorkCenterNo" style="width: 120px"></el-input>
@@ -214,6 +217,27 @@
         min-width="80"
         label="是否关闭">
       </el-table-column>
+      <el-table-column
+        prop="previousSeqNo"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="上道派工单">
+      </el-table-column>
+      <el-table-column
+        prop="previousBatchNo"
+        header-align="center"
+        align="center"
+        min-width="120"
+        label="发料批号">
+      </el-table-column>
+      <el-table-column
+        prop="materSeqNo"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="发料派工单">
+      </el-table-column>
       <el-table-column
         prop="timeRequired"
         header-align="center"
@@ -423,6 +447,7 @@
         tableData: [],
         date1: '',
         searchData: {
+          seqNo:'',
           orderNo: '',
           sWorkCenterNo: '',
           partNo: '',
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 640b2fb..603209a 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -7,6 +7,9 @@
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" type="number" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
         <el-input v-model="searchData.sWorkCenterNo" style="width: 120px"></el-input>
@@ -250,6 +253,27 @@
         min-width="100"
         label="加工中心编码">
       </el-table-column>
+      <el-table-column
+        prop="previousSeqNo"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="上道派工单">
+      </el-table-column>
+      <el-table-column
+        prop="previousBatchNo"
+        header-align="center"
+        align="center"
+        min-width="120"
+        label="发料批号">
+      </el-table-column>
+      <el-table-column
+        prop="materSeqNo"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="发料派工单">
+      </el-table-column>
     </el-table>
     <el-dialog title="扫描派工单" :close-on-click-modal="false" v-drag :visible.sync="scanModalFlag" width="215px" >
       <el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
@@ -664,6 +688,7 @@
         tableData: [],
         date1: '',
         searchData: {
+          seqNo:'',
           userId:this.$store.state.user.name,
           orderNo: '',
           sWorkCenterNo: '',
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 93cda53..30fc35f 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -7,6 +7,9 @@
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" type="number" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
         <el-input v-model="searchData.sWorkCenterNo" style="width: 120px"></el-input>
@@ -250,6 +253,27 @@
         min-width="200"
         label="产品名称">
       </el-table-column>
+      <el-table-column
+        prop="previousSeqNo"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="上道派工单">
+      </el-table-column>
+      <el-table-column
+        prop="previousBatchNo"
+        header-align="center"
+        align="center"
+        min-width="120"
+        label="发料批号">
+      </el-table-column>
+      <el-table-column
+        prop="materSeqNo"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="发料派工单">
+      </el-table-column>
       <el-table-column
         prop="sResourceID"
         header-align="center"
@@ -370,7 +394,9 @@
           '机台ID': 'sResourceID',
           '班次': 'sShiftNo',
           '加工中心': 'sWorkCenterNo',
-
+          '上道派工单': 'previousSeqNo',
+          '发料批号': 'previousBatchNo',
+          '发料派工单': 'materSeqNo',
         },
         exportName: '派工单列表' + this.getStrDate(),
         exportHeader: ['派工单列表'],
@@ -384,6 +410,7 @@
           userId:this.$store.state.user.name,
           orderNo: '',
           sWorkCenterNo: '',
+          seqNo:'',
           partNo: '',
           site: '',
           itemDesc:'',