From a07e4702be045efa9b04b49a561463875dd28e0a Mon Sep 17 00:00:00 2001 From: 肖洋 <cathay_xy@163.com> Date: 星期六, 04 一月 2025 16:18:33 +0800 Subject: [PATCH] 更新配置文件和事件总线逻辑,修复任务处理逻辑 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 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 67de370..6c709ad 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 @@ -1,4 +1,5 @@ 锘縰sing HslCommunication; +using Mapster; using Newtonsoft.Json; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -215,6 +216,20 @@ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵1000}銆�"); ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); } + else if(task.TargetAddress == "1020-1") + { + var next = task.NextAddress; + var taskCommand = MapTaskCommand(task, command); + task.NextAddress = next; + ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�"); + + conveyorLine.SendCommand(taskCommand, childDeviceCode); + ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); + + var taskHty = task.Adapt<Dt_Task_Hty>(); + _task_HtyRepository.AddData(taskHty); + _taskService.DeleteData(task); + } else { var next = task.NextAddress; -- Gitblit v1.9.3