最终下料完成后优先执行同订单同零件的上料任务

imcs-ui/src/views/zuihou/machiningClient/touchScreen/components/View3.vue

@@ -81,7 +81,7 @@
         <!--<el-button v-if="xbkValid && unFeedingCount>0 || (unFeedingCount==0 && unBaitingCount==1 && xbkValid)"  type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
 	      <el-button v-if="(unFeedingCount==0 && unBaitingCount>0) || !xbkValid" type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>-->
         <!--<el-button v-if="xbkValid"  type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>-->
-        <el-button type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
+        <el-button type="primary" :disabled="confirmDisabled" @click="submitForm(true)">{{ $t('machining.buttons.finished') }}</el-button>
         <el-button type="primary" :disabled="confirmDisabled" @click="storageForm">{{ $t('machining.buttons.inFinished') }}</el-button>
 
       </div>
@@ -209,16 +209,16 @@ export default {
             res = res.data;
             if (res.isSuccess) {                   
               if(res.data){
-                  this.submitForm()   
+                  this.submitForm(false)
               }else{
                   this.callRobot()
               }
             }
       })
     },
-  	submitForm(){
+    submitForm(priorityNextLoading){
         this.confirmDisabled = true
-        taskMgrApi.updateTaskStatus({ "id" : this.tenant.id, "updateType" : "end","processType" : "3","updateUser" : this.$store.state.account.user.id}).then((res) => {
+        taskMgrApi.updateTaskStatus({ "id" : this.tenant.id, "updateType" : "end","processType" : "3","updateUser" : this.$store.state.account.user.id, "priorityNextLoading": priorityNextLoading === true}).then((res) => {
             res = res.data;
             if (res.isSuccess) {
                 // 通知列表