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/Task/RequestInbound.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs index 1c5028a..c7d82c7 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs @@ -55,7 +55,7 @@ /// <summary> /// 澶勭悊鏂颁换鍔� /// </summary> - private async Task HandleNewTaskAsync(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue) + public async Task HandleNewTaskAsync(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue) { var stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationPLC == conveyorLine.DeviceCode); @@ -152,7 +152,7 @@ var content = CreateAndSendTask(taskDTO); if (content.Status) { - var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); + var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode, command.Barcode); if (task != null) { //var taskCommand = MapTaskCommand(task, command); @@ -231,7 +231,7 @@ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); } - else if (task.TargetAddress == "1020-1") + else if (task.TargetAddress == "1020-1" || task.TargetAddress == "1049-8") { var next = task.NextAddress; var taskCommand = MapTaskCommand(task, command); -- Gitblit v1.9.3