MES异常单不通过提交时自动终止流程

huigou-xt/src/main/webapp/system/bpm/job.js

@@ -161,7 +161,7 @@ function getApprovalParams() {
     tmpHandleResult=isNaN(tmpHandleResult)?0:tmpHandleResult;
     approvalParam.handleResult = tmpHandleResult;
     approvalParam.handleOpinion = getOpinion();
-    
+    approvalParam.processDefinitionKey = processDefinitionKey;
     return approvalParam;
 }
 
@@ -564,15 +564,26 @@ function doAdvance() {
     }
     
     var params = $.extend({}, getApprovalParams(), extendedData);
-    var url=web_app.name + '/' + getAdvanceAction();
-  
-    $('#submitForm').ajaxSubmit({
-        url: url,
-        param: params,
-        success: function () {
-            closeJobPageAndReloadTaskCenter();
-        }
-    });
+    if (getApprovalParams().processDefinitionKey == "produceExceptionProc" && getApprovalParams().handleResult == "2"){
+        var params = $.extend({}, { procInstId: procInstId });
+        $('#submitForm').ajaxSubmit({
+            url: web_app.name + '/workflow/abortProcessInstance.ajax',
+            param: params,
+            success: function () {
+                closeJobPageAndReloadTaskCenter();
+            }
+        });
+    }else {
+        var url=web_app.name + '/' + getAdvanceAction();
+
+        $('#submitForm').ajaxSubmit({
+            url: url,
+            param: params,
+            success: function () {
+                closeJobPageAndReloadTaskCenter();
+            }
+        });
+    }
 }
 
 /**

topsun/src/main/java/com/huigou/topsun/mes/produceException/application/impl/ProduceExceptionApplicationImpl.java

@@ -3,7 +3,6 @@ package com.huigou.topsun.mes.produceException.application.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.huigou.cache.DictUtil;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.context.ThreadLocalUtil;
@@ -17,7 +16,6 @@ import com.huigou.topsun.mes.produceException.domain.query.ProduceExceptionQuery
 import com.huigou.topsun.mes.produceException.domain.vo.ProduceExceptionFeedBack;
 import com.huigou.topsun.mes.produceException.domain.vo.ProduceExceptionVo;
 import com.huigou.topsun.mes.produceException.repository.ProduceExceptionRepository;
-import com.huigou.topsun.mes.unqualifiedMaterials.domain.UnqualifiedMaterialsItem;
 import com.huigou.topsun.sap.common.HttpClient;
 import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
 import com.huigou.topsun.sap.common.domain.MesResult;
@@ -44,7 +42,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @Auther: xin.lu
@@ -139,7 +136,7 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
 
     @Override
     protected void onEnd(DelegateExecution delegateExecution) {
-        super.onEnd(delegateExecution);
+        //super.onEnd(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         ProduceException produceException = produceExceptionRepository.findOne(bizId);
@@ -195,7 +192,7 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
      */
     @Override
     protected void onBack(DelegateTask delegateTask, String destActivityId) {
-        super.onBack(delegateTask, destActivityId);
+        //super.onBack(delegateTask, destActivityId);
         if ("Apply".equalsIgnoreCase(destActivityId)) {
             String bizId = delegateTask.getExecution().getProcessBusinessKey();
             ProduceException produceException = produceExceptionRepository.findOne(bizId);