From e5ec8b21084eec6086cc66adb569682a32c05dc9 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期四, 03 七月 2025 17:21:27 +0800 Subject: [PATCH] 更新任务异常信息记录功能在CommonConveyorLine_GWJob.cs 文件中,向 WIDESEAWCS_Tasks命名空间添加了一行代码, 将日志信息赋值给taskNext.ExceptionMessage属性,以便在任务处理过程中记录异常信息。 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 64 +++++++++++-------------------- 1 files changed, 23 insertions(+), 41 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs index 3ba0dd2..8f0f5d2 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs @@ -1,5 +1,7 @@ -锘縰sing Masuit.Tools; +锘縰sing Mapster; +using Masuit.Tools; using Newtonsoft.Json; +using System.Threading.Tasks; using WIDESEAWCS_Common; using WIDESEAWCS_Common.TaskEnum; using WIDESEAWCS_Core; @@ -238,34 +240,23 @@ { if (command.ConveyorLineBarcode != "NoRead") { - //var config = _sys_ConfigService.GetByConfigKey("SYS_BASE", "ISFRINTRAY"); - //if (config.ConfigValue == "1") - //{ - // Random random = new Random(); - // var task = new Dt_Task() - // { - // CurrentAddress = childDeviceCode, - // Grade = 1, - // NextAddress = "2066", - // PalletCode = command.ConveyorLineBarcode, - // Roadway = "FR", - // SourceAddress = childDeviceCode, - // TargetAddress = "2066", - // TaskNum = random.Next(1,9999), - // TaskType = (int)TaskInboundTypeEnum.InTray, - // TaskState = (int)TaskInStatusEnum.Line_InExecuting, - // WMSId = 0 - // }; - // var taskCommand = MapTaskCommand(task, command); - // conveyorLine.SendCommand(taskCommand, childDeviceCode); - //} - //else - //{ var taskDTO = CreateEmptyTrayTaskDto(command.ConveyorLineBarcode, childDeviceCode); - if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null) + if (_taskRepository.QueryFirst(x => x.PalletCode == command.ConveyorLineBarcode) != null) { - WriteInfo(conveyorLine.DeviceName, "褰撳墠鎵樼洏瀛樺湪浠诲姟"); + List<string> strings = new List<string>() { "1743", "1739", "1837", "1841" }; + + var taskExecuting = _taskRepository.QueryFirst(x => x.PalletCode == command.ConveyorLineBarcode && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting && strings.Contains(x.TargetAddress)); + + if (taskExecuting != null) + { + taskExecuting.ExceptionMessage = "鏈帴鏀跺埌绾夸綋瀹屾垚淇″彿绯荤粺鍐呴儴鑷姩瀹屾垚"; + _taskService.Delete(taskExecuting); + } + + ConsoleHelper.WriteErrorLine($"褰撳墠鎵樼洏瀛樺湪浠诲姟锛氥�恵command.ConveyorLineBarcode}銆�"); + + WriteInfo(conveyorLine.DeviceName, $"褰撳墠鎵樼洏瀛樺湪浠诲姟{command.ConveyorLineBarcode}"); return; } @@ -277,7 +268,6 @@ { var taskCommand = MapTaskCommand(task, command); conveyorLine.SendCommand(taskCommand, childDeviceCode); - //ConveyorLineSendFinish(conveyorLine, childDeviceCode, true); _taskService.UpdateTaskStatusToNext(task); } } @@ -320,9 +310,6 @@ /// </summary> private async void RequestWmsTask(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode, Dt_StationManager stationManager) { - //var taskGW = _taskRepository.QueryFirst(x => x.TargetAddress == childDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutPending)); - //if (taskGW != null) - // _taskRepository.DeleteData(taskGW); if (command.ConveyorLineBarcode.IsNullOrEmpty()) return; var content = await _taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode); if (content.Status) @@ -330,9 +317,6 @@ var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode); if (task != null) { - //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, task.TaskNum, childDeviceCode); - //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, task.NextAddress, childDeviceCode); - //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, command.ConveyorLineBarcode, childDeviceCode); 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")) { @@ -341,21 +325,22 @@ } ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task); conveyorLine.SendCommand(taskCommand, childDeviceCode); - conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode); + conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode); _taskService.UpdateTaskStatusToNext(task); } } else { - if (content.Message != "璇锋眰杩囦簬棰戠箒锛岃绋嶅悗鍐嶈瘯") + if (content.Message != "璇锋眰杩囦簬棰戠箒锛岃绋嶅悗鍐嶈瘯" || content.Message != "鏃犳硶鑾峰彇鐩爣鍦板潃") { WriteInfo(conveyorLine.DeviceName, content.Message); conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, stationManager.stationNGChildCode, childDeviceCode); - conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode); + conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode); ConsoleHelper.WriteErrorLine($"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣姹傜偣浣嶏細銆恵childDeviceCode}銆戝紓甯镐俊鎭�恵content.Message}銆�"); WriteInfo(conveyorLine.DeviceName, $"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣姹傜偣浣嶏細銆恵childDeviceCode}銆戝紓甯镐俊鎭�恵content.Message}銆�"); - } + } + ConsoleHelper.WriteErrorLine($"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣姹傜偣浣嶏細銆恵childDeviceCode}銆戝紓甯镐俊鎭�恵content.Message}銆�"); } } @@ -399,7 +384,7 @@ if (command.ConveyorLineBarcode.IsNullOrEmpty()) { - conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, childDeviceCode); + conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode); return; } @@ -410,9 +395,6 @@ }; conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode); //鎵樼洏鏈夋棤鐢佃姱淇″彿 - - - } } -- Gitblit v1.9.3