From d0f01f571918ae942349068776fa7fb70f3ab5cd Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期三, 28 八月 2024 16:20:18 +0800 Subject: [PATCH] 更新设备信息表从表导入问题 --- WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 158 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 111 insertions(+), 47 deletions(-) diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs index 994d1dc..cf2f6af 100644 --- a/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs +++ b/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs @@ -15,13 +15,16 @@ *----------------------------------------------------------------*/ #endregion << 鐗� 鏈� 娉� 閲� >> +using AutoMapper; using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; using Quartz; using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; +using WIDESEAWCS_Core; using WIDESEAWCS_Core.Helper; using WIDESEAWCS_IBasicInfoService; using WIDESEAWCS_ITaskInfoService; @@ -38,12 +41,14 @@ private readonly ITaskService _taskService; private readonly ITaskExecuteDetailService _taskExecuteDetailService; private readonly IRouterService _routerService; + private readonly IMapper _mapper; - public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService) + public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper) { _taskService = taskService; _taskExecuteDetailService = taskExecuteDetailService; _routerService = routerService; + _mapper = mapper; } public Task Execute(IJobExecutionContext context) @@ -51,53 +56,31 @@ try { CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams"); - //if (conveyorLine != null) - //{ - // List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode); + if (conveyorLine != null) + { + List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode); - // foreach (string childDeviceCode in childDeviceCodes) - // { - // ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode); - // if (command != null) - // { - // DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == command.InteractiveSignal.ToString()); - // if (deviceProtocolDetail != null) - // { - // SignalType signalType = Enum.Parse<SignalType>(deviceProtocolDetail.ProtocolDetailType); - // switch (signalType) - // { - // case SignalType.InEntranceRequest: - - // break; - // case SignalType.InEntranceRequestReset: - - // break; - // case SignalType.OutEntranceRequest: - - // break; - // case SignalType.OutEntranceRequestReset: - - // break; - // case SignalType.InStationRequest: - - // break; - // case SignalType.InStationRequestReset: - - // break; - // case SignalType.OutStationRequest: - - // break; - // case SignalType.OutStationRequestReset: - - // break; - // default: - - // break; - // } - // } - // } - // } - //} + foreach (string childDeviceCode in childDeviceCodes) + { + ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode); + if (command != null) + { + DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == command.InteractiveSignal.ToString() && x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal)); + if (deviceProtocolDetail != null) + { + MethodInfo? method = GetType().GetMethod(deviceProtocolDetail.ProtocolDetailType); + if (method != null) + { + method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode }); + } + else + { + //todo 鏈壘鍒板搴斿鐞嗘柟娉� + } + } + } + } + } } catch (Exception ex) @@ -107,5 +90,86 @@ return Task.CompletedTask; } + + public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command,string childDeviceCode) + { + if (_taskService.RequestWMsTask(command.Barcode, childDeviceCode).Status) + { + Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); + if (task != null) + { + ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task); + taskCommand.InteractiveSignal = command.InteractiveSignal; + bool t = conveyorLine.SendCommand(taskCommand, childDeviceCode); + + _taskService.UpdateTaskStatusToNext(task); + } + } + } + + public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + { + Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); + if (task != null) + { + Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress); + if (newTask != null) + { + ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask); + taskCommand.InteractiveSignal = command.InteractiveSignal; + bool t = conveyorLine.SendCommand(taskCommand, childDeviceCode); + } + } + } + + public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + { + Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); + if (task != null) + { + conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); + WebResponseContent content = _taskService.UpdateTaskStatusToNext(task); + Console.Out.WriteLine(content.Serialize()); + } + } + + public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + { + Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); + if (task != null) + { + ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task); + taskCommand.InteractiveSignal = command.InteractiveSignal; + bool t = conveyorLine.SendCommand(taskCommand, childDeviceCode); + + _taskService.UpdateTaskStatusToNext(task); + } + } + + public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + { + Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); + if (task != null) + { + Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress); + if (newTask != null) + { + ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask); + taskCommand.InteractiveSignal = command.InteractiveSignal; + bool t = conveyorLine.SendCommand(taskCommand, childDeviceCode); + } + } + } + + public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + { + Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); + if (task != null) + { + bool t = conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); + WebResponseContent content = _taskService.UpdateTaskStatusToNext(task); + Console.Out.WriteLine(content.Serialize()); + } + } } } -- Gitblit v1.9.3