HuaYiZhongHeng/BaiBuLiKu.git

huangxiaoqiang

昨天 32b3c74fa310ee5533693054a3891d133b2a338a

调整日志输出与高温线体任务注释优化

移除HttpHelper中MOMAPI接口请求/返回日志，增强WMS任务请求的控制台日志输出。优化高温二/三线体任务下发逻辑，清理冗余注释。更新各项目AssemblyInfo的版本信息。提升调试信息可读性与代码整洁性。

已修改10个文件

	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Debug/net6.0/WIDESEAWCS_IProcessService.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfo_HtyRepository.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfo_HtyService.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Debug/net6.0/WIDESEAWCS_ProcessService.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SignalR/obj/Debug/net6.0/WIDESEAWCS_SignalR.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfo_HtyRepository.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyService/obj/Debug/net6.0/WIDESEAWCS_TaskInfo_HtyService.AssemblyInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_CW/CWTask/RequestInbound.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/HttpHelper.cs

@@ -79,7 +79,6 @@
                    }
                }
                string result = string.Empty;
                QuartzLogger.WriteLogToFile($"MOMAPI接口", $"请求地址：【{serviceAddress}】,请求时间【{DateTime.Now}】请求参数【{JsonConvert.SerializeObject(requestJson)}】{Environment.NewLine}{Environment.NewLine}");

                using (HttpContent httpContent = new StringContent(requestJson))
                {
@@ -94,7 +93,6 @@
                    }
                    result = await httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync();
                }
                QuartzLogger.WriteLogToFile($"MOMAPI接口", $"请求地址：【{serviceAddress}】,返回时间【{DateTime.Now}】返回参数【{JsonConvert.SerializeObject(result)}】{Environment.NewLine}{Environment.NewLine}");
                return result;
            }
            catch (Exception e)

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Debug/net6.0/WIDESEAWCS_IProcessService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IProcessService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IProcessService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IProcessService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfo_HtyRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ITaskInfo_HtyRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ITaskInfo_HtyRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ITaskInfo_HtyRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfo_HtyService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ITaskInfo_HtyService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ITaskInfo_HtyService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ITaskInfo_HtyService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Debug/net6.0/WIDESEAWCS_ProcessService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ProcessService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ProcessService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ProcessService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SignalR/obj/Debug/net6.0/WIDESEAWCS_SignalR.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_SignalR")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_SignalR")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_SignalR")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfo_HtyRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfo_HtyRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfo_HtyRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfo_HtyRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyService/obj/Debug/net6.0/WIDESEAWCS_TaskInfo_HtyService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfo_HtyService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfo_HtyService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfo_HtyService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_CW/CWTask/RequestInbound.cs

@@ -252,7 +252,7 @@
                if (command.ConveyorLineBarcode.IsNullOrEmpty()) return;

                var content = await _taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode);

                ConsoleHelper.WriteInfoLine($"请求WMS任务接口返回：{content.ToJsonString()}");
                if (content.Status)
                {
                    var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs

@@ -316,6 +316,7 @@
            {
                if (command.ConveyorLineBarcode.IsNullOrEmpty()) return;
                var content = await _taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode);
                ConsoleHelper.WriteInfoLine($"GW【{childDeviceCode}】请求WMS任务接口返回：{content.ToJsonString()}");
                if (content.Status)
                {
                    var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);
@@ -323,16 +324,9 @@
                    {
                        if (childDeviceCode == "1039")
                        {
                            //var GWTask = _taskRepository.QueryData(x => x.Roadway.Contains("GWSC2") && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
                            //if (GWTask.Count >= 2 && childDeviceCode == "1039" && task.Roadway.Contains("GWSC2"))
                            //{
                            //    ConsoleHelper.WriteErrorLine($"托盘号：【{command.ConveyorLineBarcode}】高温二已存在【{GWTask.Count}】个任务大于2个任务不可下发");
                            //    return;
                            //}
                            var GWTask = _taskRepository.QueryData(x => (x.Roadway.Contains("GWSC2") || x.Roadway.Contains("GWSC3")) && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
                            if ((GWTask.Where(x => x.Roadway.Contains("GWSC2")).ToList().Count >= 2 && task.Roadway.Contains("GWSC2")) || (GWTask.Where(x => x.Roadway.Contains("GWSC3")).ToList().Count >= 2 && task.Roadway.Contains("GWSC3")))
                            {
                                //ConsoleHelper.WriteErrorLine($"时间：【{DateTime.Now}】托盘号：【{command.ConveyorLineBarcode}】高温{(task.Roadway.Contains("GWSC3") ? "三" : "二")}已存在【{GWTask.Count}】个任务大于2个任务不可下发");
                                return;
                            }
                        }

			@@ -79,7 +79,6 @@
			}
			}
			string result = string.Empty;
			QuartzLogger.WriteLogToFile($"MOMAPI接口", $"请求地址：【{serviceAddress}】,请求时间【{DateTime.Now}】请求参数【{JsonConvert.SerializeObject(requestJson)}】{Environment.NewLine}{Environment.NewLine}");

			using (HttpContent httpContent = new StringContent(requestJson))
			{
			@@ -94,7 +93,6 @@
			}
			result = await httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync();
			}
			QuartzLogger.WriteLogToFile($"MOMAPI接口", $"请求地址：【{serviceAddress}】,返回时间【{DateTime.Now}】返回参数【{JsonConvert.SerializeObject(result)}】{Environment.NewLine}{Environment.NewLine}");
			return result;
			}
			catch (Exception e)

			@@ -14,7 +14,7 @@
			[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IProcessService")]
			[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
			[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
			[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+990afb24199ef1f7a4648728ac28ed74394e459c")]
			[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+843cc2ea1b104ecdf9da61318a4136a5d4096411")]
			[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IProcessService")]
			[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IProcessService")]
			[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

			@@ -252,7 +252,7 @@
			if (command.ConveyorLineBarcode.IsNullOrEmpty()) return;

			var content = await _taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode);

			ConsoleHelper.WriteInfoLine($"请求WMS任务接口返回：{content.ToJsonString()}");
			if (content.Status)
			{
			var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);

			@@ -316,6 +316,7 @@
			{
			if (command.ConveyorLineBarcode.IsNullOrEmpty()) return;
			var content = await _taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode);
			ConsoleHelper.WriteInfoLine($"GW【{childDeviceCode}】请求WMS任务接口返回：{content.ToJsonString()}");
			if (content.Status)
			{
			var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);
			@@ -323,16 +324,9 @@
			{
			if (childDeviceCode == "1039")
			{
			//var GWTask = _taskRepository.QueryData(x => x.Roadway.Contains("GWSC2") && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting \|\| x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
			//if (GWTask.Count >= 2 && childDeviceCode == "1039" && task.Roadway.Contains("GWSC2"))
			//{
			// ConsoleHelper.WriteErrorLine($"托盘号：【{command.ConveyorLineBarcode}】高温二已存在【{GWTask.Count}】个任务大于2个任务不可下发");
			// return;
			//}
			var GWTask = _taskRepository.QueryData(x => (x.Roadway.Contains("GWSC2") \|\| x.Roadway.Contains("GWSC3")) && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting \|\| x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
			if ((GWTask.Where(x => x.Roadway.Contains("GWSC2")).ToList().Count >= 2 && task.Roadway.Contains("GWSC2")) \|\| (GWTask.Where(x => x.Roadway.Contains("GWSC3")).ToList().Count >= 2 && task.Roadway.Contains("GWSC3")))
			{
			//ConsoleHelper.WriteErrorLine($"时间：【{DateTime.Now}】托盘号：【{command.ConveyorLineBarcode}】高温{(task.Roadway.Contains("GWSC3") ? "三" : "二")}已存在【{GWTask.Count}】个任务大于2个任务不可下发");
			return;
			}
			}