结束派工单

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}) => {
-          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
-          this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+           //区分是否存在班次
+          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}) => {
-        this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
-        this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
+        //区分是否存在班次
+        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_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();