From 6d3c2ca2144419b16c52868912e15826fefe73cf Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 1 Feb 2024 15:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89pdf=E6=8F=92=E4=BB=B6=20=20?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=20=20=E5=AF=BC=E8=87=B4=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=A4=B1=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/searchDailyPlan.vue      | 14 ++++++++++++++
 src/views/modules/schedule/closeSchedule.vue    |  2 +-
 src/views/modules/schedule/generateReport.vue   | 17 ++++++++++++++---
 .../modules/schedule/soscheduleRouting.vue      | 10 +++++++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue
index fd0cdfc..b422d68 100644
--- a/src/views/modules/production/searchDailyPlan.vue
+++ b/src/views/modules/production/searchDailyPlan.vue
@@ -120,6 +120,20 @@
         min-width="60"
         label="计划数量">
       </el-table-column>
+      <el-table-column
+        prop="qtyfinished"
+        header-align="center"
+        align="right"
+        min-width="60"
+        label="完成数量">
+      </el-table-column>
+      <el-table-column
+        prop="finishFlag"
+        header-align="center"
+        align="center"
+        min-width="60"
+        label="是否完成">
+      </el-table-column>
 <!--      <el-table-column-->
 <!--        prop="partPlanQty"-->
 <!--        header-align="center"-->
diff --git a/src/views/modules/schedule/closeSchedule.vue b/src/views/modules/schedule/closeSchedule.vue
index a65b3e5..7b0fef4 100644
--- a/src/views/modules/schedule/closeSchedule.vue
+++ b/src/views/modules/schedule/closeSchedule.vue
@@ -9,7 +9,7 @@
       </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>
+        <el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
index a62f708..0bbf321 100644
--- a/src/views/modules/schedule/generateReport.vue
+++ b/src/views/modules/schedule/generateReport.vue
@@ -8,7 +8,7 @@
         <el-input v-model="searchData.seqNo" type="number" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'生产订单号'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
@@ -199,6 +199,14 @@
         min-width="120"
         label="结束时间">
       </el-table-column>
+      <el-table-column
+        prop="previousSeqNo"
+        header-align="center"
+        sortable
+        align="left"
+        min-width="70"
+        label="上道派工单">
+      </el-table-column>
       <el-table-column
         prop="qtyRequired"
         header-align="center"
@@ -392,7 +400,7 @@
 <!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.preparationTime" size="medium" :min="0" :controls="false"></el-input-number>-->
         </el-form-item>
         <el-form-item label="制造时间">
-          <el-input type="number" style="width: 178px;"   v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
+          <el-input type="number" style="width: 178px;" disabled  v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
 <!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.manufacturingTime" size="medium" :min="0" :controls="false"></el-input-number>-->
         </el-form-item>
       </el-form>
@@ -743,7 +751,7 @@
             this.saveHeaderData.operatorName=currentData.operatorName;
             this.saveHeaderData.qtyRequire=currentData.qtyRequired;
             this.saveHeaderData.userId=this.$store.state.user.name;
-            this.saveHeaderData.manufacturingTime=1;
+            this.saveHeaderData.manufacturingTime='';
             this.qty1='';
             this.qty2 ='';
             this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
@@ -753,6 +761,7 @@
               if(data.code===0) {
                 this.qty1 = data.row.qtyReported;
                 this.qty2 = data.row.lastApproveQty;
+                this.saveHeaderData.manufacturingTime = data.row.timeReported;
               }else {
                 this.$alert(data.msg, '错误', {
                   confirmButtonText: '确定'
@@ -792,6 +801,7 @@
         startSeqNo(inData).then(({data}) => {
           if (data && data.code === 0) {
             this.scanSeqNo='';
+            this.previousSeqNo='';
             this.startModalFlag=false;
             this.$message({
               message: '操作成功',
@@ -802,6 +812,7 @@
             })
           } else {
             this.scanSeqNo='';
+            this.previousSeqNo='';
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
diff --git a/src/views/modules/schedule/soscheduleRouting.vue b/src/views/modules/schedule/soscheduleRouting.vue
index cbff886..ff855dd 100644
--- a/src/views/modules/schedule/soscheduleRouting.vue
+++ b/src/views/modules/schedule/soscheduleRouting.vue
@@ -9,7 +9,7 @@
       </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>
+        <el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
@@ -200,6 +200,14 @@
         min-width="120"
         label="结束时间">
       </el-table-column>
+      <el-table-column
+        prop="previousSeqNo"
+        header-align="center"
+        sortable
+        align="left"
+        min-width="70"
+        label="上道派工单">
+      </el-table-column>
       <el-table-column
         prop="qtyRequired"
         header-align="center"