diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs index 5e46f82..733e26f 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs @@ -84,7 +84,7 @@ namespace MyCode.Project.Services.Implementation //requestBizData.TradeStatus = 1010; requestBizData.TradeType = 1; requestBizData.SourceTradeNos = ""; - requestBizData.ShopIds = null;// shopConfigs.Select(t => t.FSHOPCODE).ToList(); // new long[] { 378761130654261100, 378761130654261100 }; + requestBizData.ShopIds = shopConfigs.Select(t => t.FSHOPCODE).ToList(); // new long[] { 378761130654261100, 378761130654261100 }; List TradeTypeList = new List(); TradeTypeList.Add(1); TradeTypeList.Add(7); diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs index 6e68ae2..2f8baf8 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs @@ -19,11 +19,12 @@ using System.Collections.Generic; using System.Configuration; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace MyCode.Project.Services.Implementation { - public class OrderPushService : IOrderPushService + public class OrderPushService : ServiceBase, IOrderPushService { private IJackYunService _jackYunService; private IJackOrdersRepository _jackOrdersRepository; @@ -32,14 +33,15 @@ namespace MyCode.Project.Services.Implementation private IPushKingDeeOrderItemRepository _pushKingDeeOrderItemRepository; private IYTKJTShopParameterRepository _yTKJTShopParameterRepository; private IKingDeeService _kingDeeService; - + private IWorkProcessService _workProcessService; public OrderPushService(IJackOrdersRepository jackOrdersRepository , IJackOrdersItemRepository jackOrdersItemRepository , IPushKingDeeOrderRepository pushKingDeeOrderRepository , IPushKingDeeOrderItemRepository pushKingDeeOrderItemRepository , IYTKJTShopParameterRepository yTKJTShopParameterRepository , IJackYunService jackYunService - , IKingDeeService kingDeeService) + , IKingDeeService kingDeeService, + IWorkProcessService workProcessService ) { _yTKJTShopParameterRepository = yTKJTShopParameterRepository; _pushKingDeeOrderRepository = pushKingDeeOrderRepository; @@ -48,6 +50,7 @@ namespace MyCode.Project.Services.Implementation _jackOrdersItemRepository = jackOrdersItemRepository; _jackYunService = jackYunService; _kingDeeService = kingDeeService; + _workProcessService = workProcessService; } @@ -153,7 +156,11 @@ namespace MyCode.Project.Services.Implementation _pushKingDeeOrderRepository.Add(pushKingDeeOrders); _pushKingDeeOrderItemRepository.Add(pushKingDeeOrderItems); } - + pushKingDeeOrders.ForEach(t=> + { + _workProcessService.Add(this.MerchantId, "PushOrderToKingDee", "推送订单到云星空或者WMS", t.Id, 1); + Thread.Sleep(300); + }); return JsonHelper.ToJson(list); } #endregion diff --git a/Reportapi/新建文本文档.txt b/Reportapi/新建文本文档.txt index 3673a4d..a429c58 100644 --- a/Reportapi/新建文本文档.txt +++ b/Reportapi/新建文本文档.txt @@ -26,6 +26,9 @@ def BarItemClick(e): if (e.BarItemKey == "YTKJ_chongzhi"): SelectRows = this.View.SelectedDataRows Rowidlist = [] + if(SelectRows==None): + this.View.ShowMessage("请先选择数据行") + return for item in SelectRows: Rowid = "'"+item["主键"].ToString()+"'" Rowidlist.append(Rowid) @@ -34,4 +37,4 @@ def BarItemClick(e): res=DBUtils.Execute(this.Context, sql) if res>0: this.View.InvokeFormOperation("Refresh") - this.View.ShowMessage("重置了"+res.ToString()+"条数据") \ No newline at end of file + this.View.ShowMessage("重置了"+res.ToString()+"条数据") diff --git a/Reportapi/日志查询SQL.txt b/Reportapi/日志查询SQL.txt new file mode 100644 index 0000000..7b1817f --- /dev/null +++ b/Reportapi/日志查询SQL.txt @@ -0,0 +1,17 @@ + SELECT top 200 [ID] 主键 + ,[FuncMethod] [方法名] + ,[ParamInfo] [参数] + ,[ExecuteTime] [执行时间] + ,[RetryCount] [重试次数] + ,[ExceptionInfo] [报错内容] + ,[FuncStatus] [任务状态] + ,[Creater] [创建人] + ,[CreateTime] [创建时间] + ,[Editor] [修改人] + ,[EditTime] [修改时间] + ,[Remark] [备注] + + FROM [dbo].[SysWorkProcess] + where '#FEndDate#'>[CreateTime] + and '#FStartDate#'<=[CreateTime] + ORDER BY [EditTime] desc \ No newline at end of file