Commit 54862c3b authored by 鲁鑫's avatar 鲁鑫

MES异常单不通过提交时带上处理意见

parent 1ae68c0e
...@@ -565,7 +565,7 @@ function doAdvance() { ...@@ -565,7 +565,7 @@ function doAdvance() {
var params = $.extend({}, getApprovalParams(), extendedData); var params = $.extend({}, getApprovalParams(), extendedData);
if (getApprovalParams().processDefinitionKey == "produceExceptionProc" && getApprovalParams().handleResult == "2"){ if (getApprovalParams().processDefinitionKey == "produceExceptionProc" && getApprovalParams().handleResult == "2"){
var params = $.extend({}, { procInstId: procInstId }); var params = $.extend({}, { procInstId: procInstId, handleOpinion:getApprovalParams().handleOpinion});
$('#submitForm').ajaxSubmit({ $('#submitForm').ajaxSubmit({
url: web_app.name + '/workflow/abortProcessInstance.ajax', url: web_app.name + '/workflow/abortProcessInstance.ajax',
param: params, param: params,
......
...@@ -21,6 +21,7 @@ import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication; ...@@ -21,6 +21,7 @@ import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
import com.huigou.topsun.sap.common.domain.MesResult; import com.huigou.topsun.sap.common.domain.MesResult;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.operator.OperatorApplication; import com.huigou.uasp.bmp.operator.OperatorApplication;
import com.huigou.uasp.bpm.ApprovalParameter;
import com.huigou.uasp.bpm.FlowBroker; import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.uasp.bpm.ProcessAction; import com.huigou.uasp.bpm.ProcessAction;
import com.huigou.uasp.bpm.ProcessStartModel; import com.huigou.uasp.bpm.ProcessStartModel;
...@@ -182,6 +183,9 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ ...@@ -182,6 +183,9 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
String bizId = delegateExecution.getProcessBusinessKey(); String bizId = delegateExecution.getProcessBusinessKey();
ProduceException produceException = produceExceptionRepository.findOne(bizId); ProduceException produceException = produceExceptionRepository.findOne(bizId);
produceException.setStatusId(BizBillStatus.ABORTED.getId()); produceException.setStatusId(BizBillStatus.ABORTED.getId());
ApprovalParameter approvalParameter = this.getApprovalParameter();
String handleOpinion = approvalParameter.getHandleOpinion();
produceException.setResult(handleOpinion);
produceExceptionRepository.save(produceException); produceExceptionRepository.save(produceException);
this.feedBackSaleOrder(produceException,"N"); this.feedBackSaleOrder(produceException,"N");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment