diff --git a/WebContent/Flow/DealerDepositChargeApplyList.jsp b/WebContent/Flow/DealerDepositChargeApplyList.jsp index 62d297890..1d3b6add3 100644 --- a/WebContent/Flow/DealerDepositChargeApplyList.jsp +++ b/WebContent/Flow/DealerDepositChargeApplyList.jsp @@ -17,19 +17,20 @@ var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; //sParams =sParams+",FlowKey="+distributor_coding+",ProjectId="+id+",ProjectName="+distributor_coding+"-"+distributor_name+",DistributorNo="+distributor_no; sParams =sParams+",FlowKey="+distributor_no+",ProjectId="+id+",ProjectName="+distributor_coding+"-"+distributor_name+",DistributorNo="+distributor_no; - var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); - if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; - var sReturnInfos=sReturnInfo.split("@"); - if(sReturnInfos[0]=="success") - { - var objectNo=sReturnInfos[1]; - FlowFunction.openStartFlowPage(objectNo); - } - else - { - var mes=sReturnInfos[1]; + var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); + if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; + var sReturnInfos=sReturnInfo.split("@"); + if(sReturnInfos[0]=="success"){ + var objectNo=sReturnInfos[1]; + FlowFunction.openStartFlowPage(objectNo); + }else{ + var mes=sReturnInfos[1]; + if(mes==undefined){ + alert(sReturnInfos); + }else{ alert(mes); - } + } + } reloadSelf(); },"经销商保证金收取"); } diff --git a/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java b/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java index 5f81209db..b6d13ff0c 100644 --- a/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java +++ b/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java @@ -64,7 +64,8 @@ public class BaseFlowStartAction extends FlowBussionAction { // TODO Auto-generated catch block e.printStackTrace(); tx.rollback(); - return error_message; + return e.getMessage(); + //return error_message; } } @@ -272,7 +273,10 @@ public class BaseFlowStartAction extends FlowBussionAction { } } } - if(res.length()>0){res="当前流程和下面流程互斥不同时执行【"+res+"】";} + if(res.length()>0){ + res="当前流程和下面流程互斥不同时执行【"+res+"】"; + throw new Exception(res); + } return res; } /**