Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/index.vue

@@ -716,9 +716,15 @@ export default {
           label: '计划结束时间',
           width: 140
         },
+        {
+          name: 'quantity',
+          label: '排产数量',
+          width: 80,
+          align: 'center'
+        },
         {
           name: 'quantityWait',
-          label: '待加工数量',
+          label: '可加工数量',
           width: 80
         },
         {
@@ -763,12 +769,6 @@ export default {
           label: '工序',
           width: 60
         },
-        {
-          name: 'quantity',
-          label: '排产数量',
-          width: 80,
-          align: 'center'
-        },
         {
           name: 'quantityQuanlify',
           label: '合格数量',
@@ -971,7 +971,7 @@ export default {
             if (item.status === 'BEGINNING') {
               status = true;
             } else {
-              this.changeStatus(item.taskId, 'BEGINNING');
+              this.changeStatus(item.taskId, item.taskWorkunitId,'BEGINNING');
             }
           });
           if (status) {
@@ -986,7 +986,7 @@ export default {
           break;
         case 'FinshTask':
           this.tableSelectData.forEach((item) => {
-            this.changeStatus(item.taskId, 'FINISHED');
+            this.changeStatus(item.taskId, item.taskWorkunitId,'FINISHED');
           });
           this.getTaskList();
           break;
@@ -1111,7 +1111,7 @@ export default {
     },
     stopReasonSubmit() {
       this.tableSelectData.forEach((item) => {
-        this.changeStop(item.taskId, 'PAUSE');
+        this.changeStop(item.taskId, item.taskWorkunitId,'PAUSE');
       });
       this.getTaskList();
     },
@@ -1238,12 +1238,13 @@ export default {
           }
         });
     },
-    changeStatus(taskId, status) {
+    changeStatus(taskId, taskWorkunitId, status) {
       // this.form.status = status;
       this.$u.api
         .changeStatus({
           taskId: taskId,
           status: status,
+          taskWorkunitId: taskWorkunitId,
           attr1: this.stopReason
         })
         .then((res) => {
@@ -1255,12 +1256,13 @@ export default {
         });
     },
     //暂停作业
-    changeStop(taskId, status) {
+    changeStop(taskId, taskWorkunitId, status) {
       // this.form.status = status;
       this.$u.api
           .changeStatus({
             taskId: taskId,
             status: status,
+            taskWorkunitId: taskWorkunitId,
             attr1: this.stopReasonForm.reason,
             attr2: this.stopReasonForm.desc
           })
@@ -1295,9 +1297,10 @@ export default {
           workstationId: item.workstationId,
           userName: this.vuex_user.userName,
           taskId: item.taskId,
+          taskWorkunitId: item.taskWorkunitId,
           feedbackChannel: 'PAD',
           quantity: item.quantity,
-          quantityQualify: item.quantityWait,//默认为待加工数
+          quantityQualify: item.quantity-item.quantityQuanlify-item.quantityUnquanlify,//默认为排产数量-合格数-不合格数
           quantityUnqualify: 0,
           printName: false,
           nickName: this.vuex_user.nicfeedbackkName,
@@ -1351,6 +1354,7 @@ export default {
         }
         this.$u.api
           .feedback({
+            taskWorkunitId: item.taskWorkunitId,
             taskId: item.taskId,
             taskCode: item.taskCode,
             quantityFeedback: item.quantityQualify+item.quantityUnqualify,