结束派工单

src/api/yieldReport/com_finish_schedule.js

@@ -12,33 +12,8 @@ export const getSfdcToolHistBySeqNo = data => createAPI('schedule/getSfdcToolHis
 // 获取派工单的材料记录
 export const getSfdcMaterialHistBySeqNo = data => createAPI('schedule/getSfdcMaterialHistBySeqNo', 'POST', data)
 
-// 获取当前卷sfdc表的报工数据
-export const getSfdcReportedData = data => createAPI('schedule/getSfdcReportedData', 'POST', data)
-
-// 获取当前卷的材料记录--在线的
-export const getSfdcMaterialByRollNo = data => createAPI('schedule/getSfdcMaterialByRollNo', 'POST', data)
-
-// 获取当前派工单的材料记录
-export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data)
-
-// 获取当前派工单的上机卷记录
-export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data)
-
-// 获取当前派工单的不良卷记录
-export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data)
-
-// 获取当前上机卷信息
-export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data)
-
-// 结束卷的验证
-export const checkFinishRollWithNoFqc = data => createAPI('schedule/checkFinishRollWithNoFqc', 'POST', data)
-
-// 结束卷的操作
-export const finishRollWithNoFqc = data => createAPI('schedule/finishRollWithNoFqc', 'POST', data)
-
-
-
-
-
-
+// 检查当前派工单是否可以结束
+export const checkFinishScheduleWithNoFqc = data => createAPI('schedule/checkFinishScheduleWithNoFqc', 'POST', data)
 
+// 派工单结束操作
+export const finishScheduleWithNoFqc = data => createAPI('schedule/finishScheduleWithNoFqc', 'POST', data)

src/views/modules/yieldReport/com_exception_reason.vue

@@ -56,7 +56,7 @@ export default {
       //关闭当前的组件
       this.closeDialog();
       //处理结束卷组件的方法
-      this.$emit('initExceptionReason');
+      this.$emit('initExceptionReason', this.pageData.exceptionReason);
     },
 
   },

src/views/modules/yieldReport/com_finish_roll.vue

@@ -584,8 +584,16 @@ export default {
       });
         //3.刷新派工单的班次信息
       await getScheduleShiftData(this.scheduleData).then(({data}) => {
+           //区分是否存在班次
+          if(data.code == 500){
+            this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+            this.pageData.scheduledDate = '';//重置排产日期
+            this.pageData.shiftNo = '';
+          }else{
             this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
             this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+            this.pageData.shiftNo = data.row.shiftNo;
+          }
         });
         //4.刷新当前卷的最早和最晚时间
        await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
@@ -648,8 +656,16 @@ export default {
     //刷新派工单的班次信息
     refreshScheduleShiftData(){
       getScheduleShiftData(this.scheduleData).then(({data}) => {
+        //区分是否存在班次
+        if(data.code == 500){
+          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+          this.pageData.scheduledDate = '';//重置排产日期
+          this.pageData.shiftNo = '';
+        }else{
           this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
           this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+          this.pageData.shiftNo = data.row.shiftNo;
+        }
       });
     },
 
@@ -712,6 +728,7 @@ export default {
         row.netIssueQty = 0;//重新赋值
         return false;
       }
+
     },
 
     /*添加定制的css类*/
@@ -732,6 +749,8 @@ export default {
     checkValidApprovedQty(){
       //调用刷新的方法
       this.refreshSfdcData();
+      debugger;
+      this.pageData.totalQty = parseFloat(this.pageData.approvedQty) + parseFloat(this.pageData.defectedQty);
     },
 
     /*结束当前的操作*/
@@ -785,7 +804,6 @@ export default {
       let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
       //处理信息
       finishRollWithNoFqc(postData).then(({data}) => {
-        this.$message.error('qty_reported找不到!');
         //判断操作是否成功
         if(data.code == 500){
           this.$message.error(data.msg);

src/views/modules/yieldReport/com_finish_schedule.vue

@@ -53,7 +53,8 @@
                 <el-input v-model="pageData.totalSetupTime" disabled="disabled" style="width: 200px;"></el-input>
               </el-form-item>
               <el-form-item label="总调机过程停机时间(A2):">
-                <el-input v-model="pageData.totalDowntimeTimeSetup" disabled="disabled" style="width: 200px;"></el-input>
+                <el-input v-model="pageData.totalDowntimeTimeSetup" disabled="disabled"
+                          style="width: 200px;"></el-input>
               </el-form-item>
               <el-form-item label="净调机时间(A3 = A1 - A2):">
                 <el-input v-model="pageData.totalPureSetupTime" disabled="disabled" style="width: 200px;"></el-input>
@@ -81,10 +82,12 @@
                 <el-input v-model="pageData.totalManufactureTime" disabled="disabled" style="width: 200px;"></el-input>
               </el-form-item>
               <el-form-item label="总制造过程停机时间(C2 = A2 + B2):">
-                <el-input v-model="pageData.totalManufactureDowntimeTime" disabled="disabled" style="width: 200px;"></el-input>
+                <el-input v-model="pageData.totalManufactureDowntimeTime" disabled="disabled"
+                          style="width: 200px;"></el-input>
               </el-form-item>
               <el-form-item label="净制造时间(C3 = A3 + B3):">
-                <el-input v-model="pageData.totalPureManufactureTime" disabled="disabled" style="width: 200px;"></el-input>
+                <el-input v-model="pageData.totalPureManufactureTime" disabled="disabled"
+                          style="width: 200px;"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -105,7 +108,8 @@
             <el-row style="height: 55px;">
               <el-col style="text-align: center">
                 <el-form-item>
-                  <el-button type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px; width: 75px;">
+                  <el-button type="primary" @click="closeDialog"
+                             style="margin-left: 10px; margin-bottom: 5px; width: 75px;">
                     关闭
                   </el-button>
                 </el-form-item>
@@ -128,7 +132,7 @@
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
               <el-form-item :label="''" style="margin-left: 15px;">
-                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                <el-checkbox style="margin-top: 28px;" true-label="N" false-label="Y" disabled="disabled"
                              v-model="pageData.timeFinishedFlag">有记录未结束
                 </el-checkbox>
               </el-form-item>
@@ -171,7 +175,7 @@
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
               <el-form-item :label="''" style="margin-left: 15px;">
-                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                <el-checkbox style="margin-top: 28px;" true-label="N" false-label="Y" disabled="disabled"
                              v-model="pageData.toolFinishedFlag">有记录未结束
                 </el-checkbox>
               </el-form-item>
@@ -214,7 +218,7 @@
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
               <el-form-item :label="''" style="margin-left: 15px;">
-                <el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
+                <el-checkbox style="margin-top: 28px;" true-label="N" false-label="Y" disabled="disabled"
                              v-model="pageData.materialFinishedFlag">有记录未结束
                 </el-checkbox>
               </el-form-item>
@@ -274,7 +278,10 @@
     getSfdcTimeHistBySeqNo,
     getSfdcToolHistBySeqNo,
     getSfdcMaterialHistBySeqNo,
+    checkFinishScheduleWithNoFqc,
+    finishScheduleWithNoFqc,
   } from '@/api/yieldReport/com_finish_schedule.js';
+
   export default {
     name: "com_finish_roll",
     data() {
@@ -293,6 +300,7 @@ export default {
           reportedTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           scheduledDate: '',
           shiftDesc: '',
+          shiftNo: '',
           totalSetupTime: 0,//总调机时间
           totalDowntimeTimeSetup: 0,//总调机过程停机时间
           totalPureSetupTime: 0,//净调机时间
@@ -924,10 +932,11 @@ export default {
           //班次和时间的数据
           this.pageData.scheduledDate = data.resultMap.scheduledDate; //排产日期
           this.pageData.shiftDesc = data.resultMap.shiftDesc; //班次
+          this.pageData.shiftNo = data.resultMap.shiftNo;//班次的编码
           //设置是否结束的标记
-        this.pageData.timeFinishedFlag = data.resultMap.scheduledDate; //时间记录是否结束
-        this.pageData.toolFinishedFlag = data.resultMap.shiftDesc; //工具记录是否结束
-        this.pageData.materialFinishedFlag = data.resultMap.scheduledDate; //材料记录是否结束
+          this.pageData.timeFinishedFlag = data.resultMap.timeFinishedFlag; //时间记录是否结束
+          this.pageData.toolFinishedFlag = data.resultMap.toolFinishedFlag; //工具记录是否结束
+          this.pageData.materialFinishedFlag = data.resultMap.materialFinishedFlag; //材料记录是否结束
           //刷新时间的记录
           this.refreshSfdcTimeHist();
           //刷新工具的记录
@@ -1000,7 +1009,54 @@ export default {
           this.$message.error('该时间段内没有匹配的班次信息,请联系相关人员！!');
           return false;
         }
+        //先判断是否存在未结束的工具记录
+        let countNums = 0;
+        let len = this.sfdcToolList.length;
+        //循环判断是否存在未结束的
+        for (var i = 0; i < len; i++) {
+          let sfdcTool = this.sfdcToolList[i];
+          let finishedFlag = sfdcTool.finishedFlag;
+          if ('N' === finishedFlag) {
+            //设置加1
+            countNums = countNums + 1;
+          }
+        }
 
+        //判断是否需要自动
+        if (countNums > 0) {
+          this.$confirm('该派工单/卷上还有刀模尚未结束处理?请确认是否要自动处理?', '提示', {
+            confirmButtonText: '确认',
+            celButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            //设置自动处理工序的信息
+            this.pageData.autoTool = 'Y';
+            //调用检查方法
+            //先调用检查方法
+            checkFinishScheduleWithNoFqc(this.pageData).then(({data}) => {
+              //判断是否成功
+              if (data.code == 500) {
+                this.$message.error(data.msg);
+              } else if (data.resultMap.resultCode == '201') {
+                //打开异常原因录入的界面
+                this.$confirm(data.resultMap.resultMsg, '提示', {
+                  confirmButtonText: '确认',
+                  celButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  //调用检查方法
+                  this.showExceptionReasonModal();
+                });
+              } else {
+                //执行结束派工单操作
+                this.finishScheduleOperation();
+              }
+            });
+          }).catch(() => {
+            this.pageData.autoTool = 'N';
+          });
+        } else {
+          //调用检查的方法
           //先调用检查方法
           checkFinishScheduleWithNoFqc(this.pageData).then(({data}) => {
             //判断是否成功
@@ -1013,29 +1069,30 @@ export default {
                 celButtonText: '取消',
                 type: 'warning'
               }).then(() => {
+                //调用检查方法
                 this.showExceptionReasonModal();
               });
             } else {
-          //执行结束卷操作
-          this.finishRollOperation();
+              //执行结束派工单操作
+              this.finishScheduleOperation();
             }
           });
+        }
+
+
 
       },
 
       /*结束卷的具体操作*/
-    finishRollOperation(){
-      //验证通过提交到后台
-      let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
+      finishScheduleOperation() {
         //处理信息
-      finishRollWithNoFqc(postData).then(({data}) => {
-        this.$message.error('qty_reported找不到!');
+        finishScheduleWithNoFqc(this.pageData).then(({data}) => {
           //判断操作是否成功
           if (data.code == 500) {
             this.$message.error(data.msg);
           } else {
             //刷新报工的页面
-          this.$emit('refreshPageData');
+            this.$emit('processFinishScheduleOperation');
             //关闭当前的页面
             this.closeDialog();
           }
@@ -1058,8 +1115,8 @@ export default {
         //处理异常的原因
         this.pageData.exceptionFlag = 'Y';
         this.pageData.exceptionReason = exceptionReason;
-      //然后提交结束卷的数据
-      this.finishRollOperation();
+        //然后提交结束派工单的数据
+        this.finishScheduleOperation();
       }
     },
     created() {
@@ -1077,6 +1134,7 @@ export default {
     margin-top: 0px !important;
     margin-bottom: 10px;
   }
+
   /*调节页面button和input的上下间距*/
   .customer-css .customer-button {
     margin-top: 25px;
@@ -1086,6 +1144,7 @@ export default {
   .customer-item {
     margin-top: -10px;
   }
+
   /*fieldset下table的样式*/
   .customer-fieldset /deep/ .el-table__header th.is-leaf {
     line-height: 16px;

src/views/modules/yieldReport/com_produce_material.vue

@@ -198,7 +198,6 @@ export default {
       }
       //调用方法执行上材料
       feedingMaterialRoll(this.pageData).then(({data}) => {
-        debugger;
         if(data.code == 500){
           this.$message.error(data.msg);
         }else{

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -2903,7 +2903,6 @@ export default {
         this.searchData.rollNo = '';
       }
 
-      console.log(this.scheduleData,this.searchData)
       //区分不同的页签刷新不同的列表数据
       if (this.activeTable == 'sfdc_time') {
        await this.getSfdcTimeList();