From 737dec3c384f394fd6f9849b4480b697d1ba35d5 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 17 三月 2026 09:16:44 +0800
Subject: [PATCH] chore: 提交所有当前改动
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 321 +++++++++++++----------------------------------------
1 files changed, 80 insertions(+), 241 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index 37cefb6..d1cd1bb 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -1,25 +1,17 @@
-锘縰sing System;
-using System.Collections.Generic;
+锘縰sing Quartz;
+using System;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
+using System.IO;
using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.Routing;
-using Quartz;
using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Communicator;
-using WIDESEAWCS_Core.Enums;
-using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
-using WIDESEAWCS_QuartzJob.DeviceBase;
-using WIDESEAWCS_QuartzJob.Models;
-using WIDESEAWCS_QuartzJob.Service;
-using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
-using WIDESEAWCS_TaskInfoService;
+using WIDESEAWCS_QuartzJob.StackerCrane;
using WIDESEAWCS_Tasks.StackerCraneJob;
+using WIDESEA_Core;
+using WIDESEAWCS_QuartzJob.Service;
namespace WIDESEAWCS_Tasks
{
@@ -29,14 +21,47 @@
private readonly ITaskService _taskService;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly ITaskRepository _taskRepository;
- private readonly IRouterService _routerService;
- public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService)
+ private readonly StackerCraneCommandConfig _config;
+ private readonly StackerCraneTaskSelector _taskSelector;
+ private readonly StackerCraneCommandBuilder _commandBuilder;
+
+ public CommonStackerCraneJob(
+ ITaskService taskService,
+ ITaskExecuteDetailService taskExecuteDetailService,
+ ITaskRepository taskRepository,
+ IRouterService routerService,
+ HttpClientHelper httpClientHelper)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskRepository = taskRepository;
- _routerService = routerService;
+
+ _config = LoadConfig();
+ _taskSelector = new StackerCraneTaskSelector(taskService, routerService, httpClientHelper);
+ _commandBuilder = new StackerCraneCommandBuilder(taskService, routerService, _config);
+ }
+
+ /// <summary>
+ /// 鍔犺浇閰嶇疆锛堜紭鍏堢骇锛氶厤缃枃浠� > 榛樿閰嶇疆锛�
+ /// </summary>
+ private static StackerCraneCommandConfig LoadConfig()
+ {
+ try
+ {
+ string configPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "StackerCraneJob", "stackercrane-command-config.json");
+ if (File.Exists(configPath))
+ {
+ string json = File.ReadAllText(configPath);
+ return System.Text.Json.JsonSerializer.Deserialize<StackerCraneCommandConfig>(json) ?? new StackerCraneCommandConfig();
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"閰嶇疆鍔犺浇澶辫触: {ex.Message}锛屼娇鐢ㄩ粯璁ら厤缃�");
+ }
+
+ return new StackerCraneCommandConfig();
}
public Task Execute(IJobExecutionContext context)
@@ -51,257 +76,71 @@
return Task.CompletedTask;
}
+ // 璁㈤槄涓�娆′换鍔″畬鎴愪簨浠躲��
if (!commonStackerCrane.IsEventSubscribed)
{
commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;
}
- if (commonStackerCrane.IsCanSendTask(commonStackerCrane.Communicator, commonStackerCrane.DeviceProDTOs, commonStackerCrane.DeviceProtocolDetailDTOs))
- {
- commonStackerCrane.CheckStackerCraneTaskCompleted();
+ commonStackerCrane.CheckStackerCraneTaskCompleted();
- Dt_Task? task = GetTask(commonStackerCrane);
- if (task != null)
- {
- StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
- if (stackerCraneTaskCommand != null)
- {
- bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
- if (sendFlag)
- {
- commonStackerCrane.LastTaskType = task.TaskType;
- _taskService.UpdateTaskStatusToNext(task.TaskNum);
- }
- }
- }
+ if (!commonStackerCrane.IsCanSendTask(commonStackerCrane.Communicator, commonStackerCrane.DeviceProDTOs, commonStackerCrane.DeviceProtocolDetailDTOs))
+ {
+ return Task.CompletedTask;
+ }
+
+
+ // 浠诲姟閫夋嫨涓嬫矇鍒颁笓鐢ㄩ�夋嫨鍣ㄣ��
+ Dt_Task? task = _taskSelector.SelectTask(commonStackerCrane);
+ if (task == null)
+ {
+ return Task.CompletedTask;
+ }
+
+ // 鍛戒护鏋勫缓涓嬫矇鍒颁笓鐢ㄦ瀯寤哄櫒銆�
+ object? stackerCraneTaskCommand = _commandBuilder.ConvertToStackerCraneTaskCommand(task);
+ if (stackerCraneTaskCommand == null)
+ {
+ return Task.CompletedTask;
+ }
+
+ bool sendFlag = SendStackerCraneCommand(commonStackerCrane, stackerCraneTaskCommand);
+ if (sendFlag)
+ {
+ commonStackerCrane.LastTaskType = task.TaskType;
+ _taskService.UpdateTaskStatusToNext(task.TaskNum);
}
}
catch (Exception ex)
{
Console.WriteLine($"CommonStackerCraneJob Error: {ex.Message}");
}
+
return Task.CompletedTask;
}
/// <summary>
/// 浠诲姟瀹屾垚浜嬩欢璁㈤槄鐨勬柟娉�
/// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e)
+ private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, StackerCraneTaskCompletedEventArgs e)
{
CommonStackerCrane? commonStackerCrane = sender as CommonStackerCrane;
if (commonStackerCrane != null)
{
- if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
- {
- Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
- _taskService.StackCraneTaskCompleted(e.TaskNum);
- commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
- }
+ Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
+ _taskService.StackCraneTaskCompleted(e.TaskNum);
+ commonStackerCrane.SetValue(StackerCraneDBName.WorkAction, 2);
}
}
- /// <summary>
- /// 鑾峰彇浠诲姟
- /// </summary>
- /// <param name="commonStackerCrane">鍫嗗灈鏈哄璞�</param>
- /// <returns></returns>
- private Dt_Task? GetTask(IStackerCrane commonStackerCrane)
+ private static bool SendStackerCraneCommand(IStackerCrane commonStackerCrane, object command)
{
- Dt_Task? task = null;
- if (commonStackerCrane.LastTaskType == null)
+ return command switch
{
- task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
- }
- else
- {
- if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- task ??= _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
- }
- else
- {
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
- }
- }
-
- if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- if (IsOutTaskStationAvailable(task))
- {
- return task;
- }
-
- List<string> otherOutStationCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress, task.TaskType)
- .Select(x => x.ChildPosi).ToList();
- List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStationCodes);
- foreach (var alternativeTask in tasks)
- {
- if (IsOutTaskStationAvailable(alternativeTask))
- {
- return alternativeTask;
- }
- }
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- }
-
- return task;
- }
-
- /// <summary>
- /// 鍑哄簱浠诲姟鍒ゆ柇鍑哄簱绔欏彴鏄惁鍙敤
- /// </summary>
- /// <param name="task">浠诲姟瀹炰綋</param>
- /// <returns>濡傛灉绔欏彴鍙敤杩斿洖true锛屽惁鍒欒繑鍥瀎alse</returns>
- private bool IsOutTaskStationAvailable([NotNull] Dt_Task task)
- {
- Dt_Router? router = _routerService.QueryNextRoute(task.Roadway, task.NextAddress, task.TaskType);
- if (router == null)
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.NextAddress}銆戜俊鎭紝鏃犳硶鏍￠獙绔欏彴");
- return false;
- }
-
- IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == router.ChildPosiDeviceCode);
- if (device == null)
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒板嚭搴撶珯鍙般�恵router.ChildPosiDeviceCode}銆戝搴旂殑閫氳瀵硅薄锛屾棤娉曞垽鏂嚭搴撶珯鍙版槸鍚﹁鍗犵敤");
- return false;
- }
-
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- return conveyorLine.IsOccupied(router.ChildPosi);
- }
-
- /// <summary>
- /// 浠诲姟瀹炰綋杞崲鎴愬懡浠odel
- /// </summary>
- /// <param name="task">浠诲姟瀹炰綋</param>
- /// <returns></returns>
- public StackerCraneTaskCommand? ConvertToStackerCraneTaskCommand([NotNull] Dt_Task task)
- {
- StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand
- {
- Barcode = task.PalletCode,
- TaskNum = task.TaskNum,
- WorkType = 1,
- TrayType = 0
+ FormationStackerCraneTaskCommand formationCommand => commonStackerCrane.SendCommand(formationCommand),
+ StackerCraneTaskCommand standardCommand => commonStackerCrane.SendCommand(standardCommand),
+ _ => false
};
-
- TaskTypeGroup taskTypeGroup = task.TaskType.GetTaskTypeGroup();
- return taskTypeGroup switch
- {
- TaskTypeGroup.InboundGroup => BuildInboundCommand(task, stackerCraneTaskCommand),
- TaskTypeGroup.OutbondGroup => BuildOutboundCommand(task, stackerCraneTaskCommand),
- TaskTypeGroup.RelocationGroup => BuildRelocationCommand(task, stackerCraneTaskCommand),
- _ => stackerCraneTaskCommand
- };
- }
-
- /// <summary>
- /// 鏋勫缓鍏ュ簱鍛戒护
- /// </summary>
- private StackerCraneTaskCommand? BuildInboundCommand(Dt_Task task, StackerCraneTaskCommand command)
- {
- Dt_Router? router = _routerService.QueryNextRoute(task.CurrentAddress, task.Roadway, task.TaskType);
- if (router == null)
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.CurrentAddress}銆戜俊鎭紝鏃犳硶鑾峰彇瀵瑰簲鐨勫爢鍨涙満鍙栬揣绔欏彴淇℃伅");
- return null;
- }
-
- command.StartRow = Convert.ToInt16(router.SrmRow);
- command.StartColumn = Convert.ToInt16(router.SrmColumn);
- command.StartLayer = Convert.ToInt16(router.SrmLayer);
-
- if (!TryParseAddress(task.NextAddress, out short endRow, out short endColumn, out short endLayer))
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍏ュ簱浠诲姟缁堢偣閿欒锛岀粓鐐癸細銆恵task.NextAddress}銆�");
- return null;
- }
-
- command.EndRow = endRow;
- command.EndColumn = endColumn;
- command.EndLayer = endLayer;
-
- return command;
- }
-
- /// <summary>
- /// 鏋勫缓鍑哄簱鍛戒护
- /// </summary>
- private StackerCraneTaskCommand? BuildOutboundCommand(Dt_Task task, StackerCraneTaskCommand command)
- {
- Dt_Router? router = _routerService.QueryNextRoute(task.Roadway, task.TargetAddress, task.TaskType);
- if (router == null)
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鏈壘鍒扮珯鍙般�恵task.TargetAddress}銆戜俊鎭紝鏃犳硶鑾峰彇瀵瑰簲鐨勫爢鍨涙満鏀捐揣绔欏彴淇℃伅");
- return null;
- }
-
- command.EndRow = Convert.ToInt16(router.SrmRow);
- command.EndColumn = Convert.ToInt16(router.SrmColumn);
- command.EndLayer = Convert.ToInt16(router.SrmLayer);
-
- if (!TryParseAddress(task.CurrentAddress, out short startRow, out short startColumn, out short startLayer))
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
- return null;
- }
-
- command.StartRow = startRow;
- command.StartColumn = startColumn;
- command.StartLayer = startLayer;
-
- return command;
- }
-
- /// <summary>
- /// 鏋勫缓绉诲簱鍛戒护
- /// </summary>
- private StackerCraneTaskCommand? BuildRelocationCommand(Dt_Task task, StackerCraneTaskCommand command)
- {
- if (!TryParseAddress(task.NextAddress, out short endRow, out short endColumn, out short endLayer))
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟缁堢偣閿欒锛岀粓鐐癸細銆恵task.NextAddress}銆�");
- return null;
- }
-
- command.EndRow = endRow;
- command.EndColumn = endColumn;
- command.EndLayer = endLayer;
-
- if (!TryParseAddress(task.CurrentAddress, out short startRow, out short startColumn, out short startLayer))
- {
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
- return null;
- }
-
- command.StartRow = startRow;
- command.StartColumn = startColumn;
- command.StartLayer = startLayer;
-
- return command;
- }
-
- /// <summary>
- /// 瑙ｆ瀽鍦板潃瀛楃涓诧紙鏍煎紡锛氳-鍒�-灞傦級
- /// </summary>
- private bool TryParseAddress(string address, out short row, out short column, out short layer)
- {
- row = column = layer = 0;
-
- string[] parts = address.Split("-");
- if (parts.Length != 3)
- {
- return false;
- }
-
- return short.TryParse(parts[0], out row)
- && short.TryParse(parts[1], out column)
- && short.TryParse(parts[2], out layer);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3