From d2c19eb1f1d03dc494259f3df95bc63230c791a1 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期四, 03 七月 2025 16:20:39 +0800 Subject: [PATCH] 添加任务删除功能并简化代码逻辑在 `ITaskService.cs` 中新增 `Delete` 方法以支持任务删除,并在 `TaskService.cs` 中实现该方法,适配任务并调用基类删除逻辑。同时,优化了 `RequestInbound.cs` 中的 `CreateAndSendEmptyTrayTask` 和 `RequestWmsTask` 方法,移除冗余注释和不必要的查询,提升代码可读性和维护性。 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 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 5987e7e..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; } @@ -319,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) @@ -329,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")) { -- Gitblit v1.9.3