Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java

@@ -170,7 +170,7 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe
                 logger_342d5bb6.info(String.valueOf("end log--" + code + "--" + sqrxm));
                 if (!"S".equals(sta)) {
                     request.getRequestManager().setMessagecontent("SAP返回失败信息：" + meg);
-                    return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager()));
+                    return WeaResult.fail(500, meg, getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager()));
                 }
             } catch (Exception e) {
                 logger_342d5bb6.info(String.valueOf("start log"));
@@ -179,13 +179,13 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe
                 logger_342d5bb6.info(String.valueOf("------------------------------------------------------------------------"));
                 logger_342d5bb6.info(String.valueOf("end log"));
                 request.getRequestManager().setMessagecontent("数据同步SAP失败：" + e.toString());
-                return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager()));
+                return WeaResult.fail(500, e.toString(), getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager()));
             }
             return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
         } catch (Exception e) {
             e.printStackTrace();
             logger_342d5bb6.error("ZOA_MM_PR_CREATE_YFAction e: {}", e.getMessage());
-            return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager()));
+            return WeaResult.fail(500, e.toString(), getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager()));
         }
     }