From 74dd275168780262ec3b0d5b1224763b2f6a31eb Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Fri, 25 Jul 2025 22:23:48 +0800 Subject: [PATCH] 1111 --- Reportapi/MyCode.Project.Domain/Model/SysWorkprocess.cs | 7 +++++++ Reportapi/MyCode.Project.ScheduleTask/App.config | 8 ++++++-- .../IServices/IOrderPushService.cs | 2 +- .../Implementation/OrderPushService.cs | 6 +++++- .../Implementation/WorkProcessService.cs | 9 ++++++--- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Reportapi/MyCode.Project.Domain/Model/SysWorkprocess.cs b/Reportapi/MyCode.Project.Domain/Model/SysWorkprocess.cs index 801489c..61f518c 100644 --- a/Reportapi/MyCode.Project.Domain/Model/SysWorkprocess.cs +++ b/Reportapi/MyCode.Project.Domain/Model/SysWorkprocess.cs @@ -128,5 +128,12 @@ namespace MyCode.Project.Domain.Model /// public int? Priority {get;set;} + /// + /// Desc:程序执行结果返回内容 + /// Default: + /// Nullable:True + /// + public string Result {get;set;} + } } diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config index 998488e..e41e089 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/App.config +++ b/Reportapi/MyCode.Project.ScheduleTask/App.config @@ -14,8 +14,12 @@ - - + + + + + diff --git a/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs b/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs index 19dbebf..dfb9cfd 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IOrderPushService.cs @@ -9,6 +9,6 @@ namespace MyCode.Project.Services.IServices { public interface IOrderPushService { - void PushOrderToKingDee(string id); + string PushOrderToKingDee(string id); } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs index d2a4604..6e68ae2 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs @@ -158,8 +158,9 @@ namespace MyCode.Project.Services.Implementation } #endregion - public void PushOrderToKingDee(string id) + public string PushOrderToKingDee(string id) { + string result2 = ""; var orderHead = _pushKingDeeOrderRepository.Queryable().Where(t => id == t.Id.ToString()).First(); if (orderHead.Status != 0) { @@ -184,6 +185,7 @@ namespace MyCode.Project.Services.Implementation if (param.FSYNCHRONIZEKINGDEE == "1") { var response = PushKingdeeSaleOrder(orderHead, param); + result2 = JsonHelper.ToJson(response); // 如果保存成功,需要更新源单数据 if (response.IsSuccess) { @@ -196,12 +198,14 @@ namespace MyCode.Project.Services.Implementation { //wms var result = PushWMSSaleOrder(orderHead, param); + result2 = JsonHelper.ToJson(result); if (result.Code == 200) { orderHead.Status = 2; _pushKingDeeOrderRepository.Update(orderHead); } } + return result2; } diff --git a/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs b/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs index 4d7a7c3..be6fafd 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/WorkProcessService.cs @@ -165,19 +165,22 @@ namespace MyCode.Project.Services.Implementation var type = UnityHelper.GetUnityContainer().Resolve(Type.GetType(process.FuncClass)); MethodInfo method = type.GetType().GetMethod(process.FuncMethod); + object result = new object(); if (!string.IsNullOrEmpty(process.ParamInfo)) { - method.Invoke(type, new object[] { process.ParamInfo }); + result= method.Invoke(type, new object[] { process.ParamInfo }); } else { - method.Invoke(type, new object[] { }); + result= method.Invoke(type, new object[] { }); } - + if (result == null) + result = ""; process.FuncStatus = (int)WorkProcessStatus.Complete; process.ExecuteTime = DateTime.Now; process.ExceptionInfo = string.Empty; + process.Result= result.ToString(); _SysWorkProcessRepository.Update(process); }