diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java index 68eaa58..f58f5b4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CheckSystemAction.java @@ -85,7 +85,7 @@ public class CheckSystemAction extends BaseBean implements Action, EsbServerless logger_b4155f0e.error(String.valueOf("工号:" + yhgh + ",此流程已有未归档的申请,待归档后才能再次申请。")); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("此流程已有未归档的申请,待归档后才能再次申请。"); - return WeaResult.fail(500, "此流程已有未归档的申请,待归档后才能再次申请。" , getResultMapForAction(weaverResultMap, "result", "返回错误信息" , request.getRequestManager())); + return WeaResult.fail(500, "工号:" + yhgh + ",此流程已有未归档的申请,待归档后才能再次申请。" , getResultMapForAction(weaverResultMap, "result", "返回错误信息" , request.getRequestManager())); } // GetSystemList sys = new GetSystemList(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java index e9f6dbf..038bd07 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java @@ -166,12 +166,12 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, String tablename = ""; String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); + tablename = request.getRequestManager().getBillTableName(); + ZOA_MM_PR_CREATE_ZJGC po = new ZOA_MM_PR_CREATE_ZJGC(); logger_518ea046.error(String.valueOf("prtype == " + prtype)); - logger_518ea046.error(String.valueOf("prdetail == " + prdetail)); + logger_518ea046.error(String.valueOf("prdetail == " + Arrays.deepToString(prdetail))); - tablename = request.getRequestManager().getBillTableName(); - ZOA_MM_PR_CREATE_ZJGC po = new ZOA_MM_PR_CREATE_ZJGC(); String[] fhz = po.Getexecute(prtype, prdetail); String prno = fhz[0]; String sta = fhz[1]; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java index bdd7670..d59ab28 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_DP_Action.java @@ -210,6 +210,8 @@ public class ZOA_SL_DP_Action extends BaseBean implements Action, EsbServerlessR // OaCtrip oactrip = new OaCtrip(); oactrip.setPassengerDetails(passengerdetails); oactrip.setGWPassengerDetails(gwpassengerdetails); + + String[] strreturn = oactrip.call(approvalnumber, employeeid, expiredtime, begindate, enddate, cclx); if (status.equals("S")) { status = strreturn[0];