From 1a02791b12af1c7dc0a7816c9ae60f5ede442de4 Mon Sep 17 00:00:00 2001 From: 刘磊 <1161824510@qq.com> Date: 星期五, 15 十一月 2024 14:32:16 +0800 Subject: [PATCH] 1 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 410 ++++++++++++++++++++++++---------------------------------- 1 files changed, 168 insertions(+), 242 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs index f2b2880..3bd8816 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs @@ -27,6 +27,7 @@ using WIDESEAWCS_Core; using WIDESEAWCS_Core.Helper; using WIDESEAWCS_DTO.TaskInfo; +using WIDESEAWCS_IProcessRepository; using WIDESEAWCS_ITaskInfoRepository; using WIDESEAWCS_ITaskInfoService; using WIDESEAWCS_Model.Models; @@ -39,24 +40,23 @@ namespace WIDESEAWCS_Tasks { [DisallowConcurrentExecution] - public class CommonConveyorLineJob : JobBase, IJob + public partial class CommonConveyorLineJob : JobBase, IJob { - private readonly List<string> _deviceCodes1 = new List<string>() { "1063", "1061", "1060" }; - private readonly List<string> _deviceCodes2 = new List<string>() { "1067", "1069", "1068" }; - private readonly string[] HCTrayCode = { "1012", "1013" }; - private readonly ITaskService _taskService; + public readonly ITaskService _taskService; private readonly ITaskRepository _taskRepository; private readonly ITaskExecuteDetailService _taskExecuteDetailService; private readonly IRouterService _routerService; + private readonly IPlatFormRepository _platFormRepository; private readonly IMapper _mapper; - public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository) + public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository) { _taskService = taskService; _taskExecuteDetailService = taskExecuteDetailService; _routerService = routerService; _mapper = mapper; _taskRepository = taskRepository; + _platFormRepository = platFormRepository; } public Task Execute(IJobExecutionContext context) @@ -108,35 +108,49 @@ } } } + + Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active"); + if (platform != null) + { + if (command.InteractiveSignal != 2) + { + MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod); + if (method != null) + { + command.InteractiveSignal = commandWrite.WriteInteractiveSignal; + int count = string.IsNullOrEmpty(platform.Location) ? 0 + 1 : platform.Location.Split(',').Count() + 1; + method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform }); + } + } + else + { + if (!string.IsNullOrEmpty(platform.Location)) + { + var strings = platform.Location.Split(',').ToList(); + foreach (var ite in strings) + { + int index = strings.FindIndex(p => p == ite); + ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(ite); + if (command1.InteractiveSignal != 2) + { + MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod); + if (method != null) + { + command.InteractiveSignal = commandWrite.WriteInteractiveSignal; + int count = strings.Count - index; + method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform }); + } + } + } + } + } + } } //}); + //tasks.Add(task); + Task.WaitAll(tasks.ToArray()); } - //for (int i = 0; i < _deviceCodes1.Count; i++) - //{ - // ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(_deviceCodes1[i]); - // if (command.InteractiveSignal != 2) - // { - // EmptyTrayReturn(conveyorLine, command, _deviceCodes1[_deviceCodes1.Count - 1], i); - // } - //} - //for (int i = 0; i < _deviceCodes2.Count; i++) - //{ - // ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(_deviceCodes2[i]); - // if (command.InteractiveSignal != 2) - // { - // EmptyTrayReturn(conveyorLine, command, _deviceCodes2[_deviceCodes1.Count - 1], i); - // } - //} - foreach (var item in HCTrayCode) - { - ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(item); - if (command.InteractiveSignal != 2) - { - ChuanhuaOutbound(conveyorLine, command, HCTrayCode[0], 0); - } - } - Task.WaitAll(tasks.ToArray()); } } catch (Exception ex) @@ -148,6 +162,7 @@ //WriteDebug("CommonConveyorLineJob", "test"); //Console.Out.WriteLine(DateTime.Now); } + return Task.CompletedTask; } @@ -160,205 +175,28 @@ /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param> public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue) { - var taskNew = _taskService.QueryCraneConveyorLineTask(command.Barcode.ObjToInt(), childDeviceCode); - var Taskout = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); - if (Taskout != null) + try { - // 绌烘墭鐩樹换鍔� - if (Taskout.TaskType == (int)TaskOutboundTypeEnum.OutTray) + // 鑾峰彇涓嬩竴涓换鍔� + var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode); + //var taskOut = _taskService.QueryNextConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); + //return; + // 澶勭悊鍑哄簱浠诲姟 + HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task); + + // 濡傛灉娌℃湁鍑哄簱浠诲姟锛屽鐞嗘柊浠诲姟 + if (task == null && command.Barcode != "NoRead") { - if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) - { - ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout); - taskCommand.InteractiveSignal = command.InteractiveSignal; - if (command.Barcode == "") - { - taskCommand.TargetAddress = 1092; - } - conveyorLine.SendCommand(taskCommand, childDeviceCode); - - ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); - - _taskService.UpdateTaskStatusToNext(Taskout); - } - else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) - { - if (command.Barcode == "") - { - ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout); - taskCommand.InteractiveSignal = command.InteractiveSignal; - taskCommand.TargetAddress = 1092; - conveyorLine.SendCommand(taskCommand, childDeviceCode); - - ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); - _taskService.UpdateTaskStatusToNext(Taskout); - } - } - } - else if (Taskout.TaskType == (int)TaskOutboundTypeEnum.Outbound) - { - if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting) - { - ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout); - taskCommand.InteractiveSignal = command.InteractiveSignal; - if (command.Barcode == "") - { - //todo 娌℃湁鏄庣‘寮傚父鍙o紝閫佸埌鐩爣宸烽亾鐨凬G鍙� - //taskCommand.TargetAddress = 1092; - } - conveyorLine.SendCommand(taskCommand, childDeviceCode); - - ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); - - _taskService.UpdateTaskStatusToNext(Taskout); - } - else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) - { - if (command.Barcode == "") - { - ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout); - taskCommand.InteractiveSignal = command.InteractiveSignal; - // todo 閫佸埌鐩爣宸烽亾鐨凬G鍙� - taskCommand.TargetAddress = 1092; - conveyorLine.SendCommand(taskCommand, childDeviceCode); - - ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); - _taskService.UpdateTaskStatusToNext(Taskout); - } - else - { - // todo 璋冪敤WMS浠诲姟瀹屾垚鎺ュ彛 - var x = new { taskNum = Taskout.TaskNum }; - var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result; - WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result); - if (content.Status) - { - ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); - _taskService.UpdateTaskStatusToNext(Taskout); - } - } - } + HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue); } } - if (taskNew == null) + catch (Exception ex) { - 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; - conveyorLine.SendCommand(taskCommand, childDeviceCode); - - ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); - - _taskService.UpdateTaskStatusToNext(task); - } - } + return; } } - // - /// <summary> - /// 绌烘墭鐩樺洖娴� - /// </summary> - /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> - /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param> - /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param> - /// <param name="index">璇诲彇鐨勭涓�涓綅缃�</param> - public void EmptyTrayReturn(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index) - { - var tasks = _taskRepository.QueryData(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.TaskType == (int)TaskOutboundTypeEnum.OutTray); - if (tasks.Count <= index) - { - WMSTaskDTO taskDTO = new WMSTaskDTO() - { - TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")), - Grade = 1, - PalletCode = DateTime.Now.ToString("yyyyMMddHHmmss"), - RoadWay = "CHSC01", - SourceAddress = "001-001-001", - TargetAddress = childDeviceCode, - TaskState = (int)TaskOutStatusEnum.OutNew, - Id = 0, - TaskType = (int)TaskOutboundTypeEnum.OutTray - }; - - #region 鐪熷疄鏁版嵁 - - // TODO: 璋冪敤鎺ュ彛鑾峰彇涓嬩竴涓湴鍧� - //RequestTaskDto request = new RequestTaskDto() - //{ - // Position = sourceAddress, - // PalletCode = palletCode, - //}; - - //// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲 - //var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result; - - //// 鍙嶅簭鍒楀寲鍝嶅簲鍐呭 - //WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result); - - //// 妫�鏌ョ姸鎬佸苟杩斿洖 - ////if (!content.Status) - //// return content; - - //// 鍙嶅簭鍒楀寲浠诲姟鏁版嵁 - //WMSTaskDTO task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString()); - - #endregion - - var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO }); - if (content.Status) - { - Console.WriteLine("绌烘墭鐩樺懠鍙垚鍔�"); - } - } - } - - /// <summary> - /// 闄堝寲鍑哄簱 - /// </summary> - /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> - /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param> - /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param> - /// <param name="index">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param> - public void ChuanhuaOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index) - { - var tasks = _taskRepository.QueryData(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.TaskType == (int)TaskOutboundTypeEnum.Outbound); - if (tasks.Count <= index) - { - WMSTaskDTO taskDTO = new WMSTaskDTO() - { - TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")), - Grade = 1, - PalletCode = DateTime.Now.ToString("MMddHHmmss"), - RoadWay = "CHSC01", - SourceAddress = "001-001-001", - TargetAddress = childDeviceCode, - TaskState = (int)TaskOutStatusEnum.OutNew, - Id = 0, - TaskType = (int)TaskOutboundTypeEnum.Outbound, - }; - - var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO }); - if (content.Status) - { - Console.WriteLine("鍑哄簱鍛煎彨鎴愬姛"); - } - } - else - { - Dt_Task task = tasks[index]; - if (task != null) - { - ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task); - taskCommand.InteractiveSignal = command.InteractiveSignal; - conveyorLine.SendCommand(taskCommand, childDeviceCode); - } - } - } + #region 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃 /// <summary> /// 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃 @@ -366,20 +204,22 @@ /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param> /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param> - 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; - conveyorLine.SendCommand(taskCommand, childDeviceCode); - } - } - } + //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; + // conveyorLine.SendCommand(taskCommand, childDeviceCode); + // } + // } + //} + + #endregion /// <summary> /// 杈撻�佺嚎鍏ュ簱瀹屾垚 @@ -397,7 +237,8 @@ //conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); WebResponseContent content = _taskService.UpdateTaskStatusToNext(task); - Console.Out.WriteLine(content.Serialize()); + + //Console.Out.WriteLine(content.Serialize()); } } @@ -407,7 +248,8 @@ /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param> /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param> - public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param> + public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue) { Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); if (task != null) @@ -416,6 +258,7 @@ taskCommand.InteractiveSignal = command.InteractiveSignal; conveyorLine.SendCommand(taskCommand, childDeviceCode); + ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); _taskService.UpdateTaskStatusToNext(task); } } @@ -447,18 +290,101 @@ /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param> /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param> - public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) + public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue) { 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()); + WebResponseContent content = new WebResponseContent(); + ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task); + taskCommand.InteractiveSignal = command.InteractiveSignal; + if (task.PalletCode != command.Barcode) + { + var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity; + taskCommand.TargetAddress = NGAddress; + } + else + { + taskCommand.TargetAddress = 0; + } + + conveyorLine.SendCommand(taskCommand, childDeviceCode); + ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true); + content = _taskService.UpdateTaskStatusToNext(task); } } /// <summary> + /// 鐩戞祴绌烘墭鐩樺疄鐩樺嚭搴� + /// </summary> + /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> + /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param> + /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param> + /// <param name="index">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param> + public async void EmptyTrayReturn(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index, Platform platform) + { + try + { + TaskOutboundTypeEnum taskOutboundTypeEnum; + if (platform.PlatformType.Contains("OutTray")) + taskOutboundTypeEnum = TaskOutboundTypeEnum.OutTray; + else + taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound; + await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform.Stacker.Split(',')[0], platform.Stacker.Split(',').ToList()); + } + catch (Exception) + { + } + } + + /// <summary> + /// 妫�鏌ヤ换鍔″苟鍒涘缓鏂颁换鍔� + /// </summary> + private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, List<string> roadways = null) + { + var tasks = _taskRepository.QueryData(x => x.TaskType == (int)taskType && x.TargetAddress == childDeviceCode); + if (tasks.Count < index) + { + #region 璋冪敤WMS鑾峰彇鍑哄簱浠诲姟 + + WMSTaskDTO taskDTO = new WMSTaskDTO(); + object dynamic = new + { + position = childDeviceCode, + tag = (int)taskType, + areaCdoe = roadWay, + roadways = roadways + }; + var result = await HttpHelper.PostAsync("http://localhost:5000/api/Task/RequestTrayOutTaskAsync", dynamic.ToJsonString()); + + WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result); + + // 妫�鏌ョ姸鎬佸苟杩斿洖 + if (!content.Status) + return; + + taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString()); + + #endregion + + CreateAndSendTask(taskDTO); + } + } + + /// <summary> + /// 鍒涘缓浠诲姟 + /// </summary> + public WebResponseContent CreateAndSendTask(WMSTaskDTO taskDTO) + { + var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO }); + if (content.Status) + { + Console.WriteLine($"{taskDTO.TaskType}鍛煎彨鎴愬姛"); + } + return content; + } + + /// <summary> /// 杈撻�佺嚎浜や簰瀹屾垚 /// </summary> /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param> -- Gitblit v1.9.3