From 7f3a2e67f82c2d286e902b028b422bf07e9aacb6 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期一, 21 七月 2025 01:41:10 +0800 Subject: [PATCH] 调整超时设置,简化日志,优化节流限制 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 2 +- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 2 -- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 2 -- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs index 91f38e6..f226d5e 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs @@ -82,7 +82,7 @@ { httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json"); using HttpClient httpClient = new HttpClient(); - httpClient.Timeout = new TimeSpan(0, 0, 60); + httpClient.Timeout = new TimeSpan(0, 0, 120); if (headers != null) { diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs index 33c3745..9736d13 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs @@ -415,8 +415,6 @@ var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString()); ConsoleHelper.WriteSuccessLine(content.Data.ToString()); - QuartzLogger.WriteLogToFile($"鍖呰鍑哄簱", $"杩斿洖鍙傛暟銆恵JsonConvert.SerializeObject(task)}銆憑Environment.NewLine}{Environment.NewLine}"); - //_taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO })鈥� content = ReceiveWMSTask(new List<WMSTaskDTO> { task }); QuartzLogger.WriteLogToFile($"鍖呰鍑哄簱", $"杩斿洖鍙傛暟銆恵JsonConvert.SerializeObject(content)}銆憑Environment.NewLine}{Environment.NewLine}"); diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs index cc0a1e0..1b68a70 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs @@ -1128,7 +1128,6 @@ .OrderBy(x => x.OutboundTime) .FirstAsync(); - if (stockInfo == null) throw new Exception($"搴撳唴{station.productLine}鏃犳弧瓒虫潯浠剁殑搴撳瓨鍙嚭搴�"); DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode); @@ -1156,7 +1155,6 @@ ProcessCode = stockInfo.ProcessCode, }; WMSTaskDTO taskDTO = CreateTaskDTO(task); - int lastStatus = locationInfo.LocationStatus; BaseDal.AddData(task); diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs index 0b914fb..a510ec9 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs @@ -185,7 +185,7 @@ /// <param name="input">璇锋眰鏁版嵁</param> /// <returns></returns> [HttpPost, AllowAnonymous, Route("RequestOutTaskToBZAsync")] - [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 11 })] // 5绉掕妭娴� + [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴� public async Task<WebResponseContent> RequestOutTaskToBZAsync([FromBody] RequestTaskDto input) { return await Service.RequestOutTaskToBZAsync(input); -- Gitblit v1.9.3