From 970d9c5c36d526a587138232ae9dae719dbcd16d Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期一, 14 四月 2025 16:43:16 +0800 Subject: [PATCH] WCS添加获取设备信息 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" index 7a9f88c..60abfe5 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" @@ -16,6 +16,7 @@ using WIDESEAWCS_Common.StackerCraneEnum; using WIDESEAWCS_Common.TaskEnum; using WIDESEAWCS_Core; +using WIDESEAWCS_Core.Caches; using WIDESEAWCS_Core.Helper; using WIDESEAWCS_IShuttleCar; using WIDESEAWCS_ITaskInfoRepository; @@ -29,6 +30,7 @@ using WIDESEAWCS_QuartzJob.StackerCrane.Enum; using WIDESEAWCS_TaskInfoService; using WIDESEAWCS_Tasks.ConveyorLineJob; +using WIDESEAWCS_Tasks.ShuttleCarJob; using WIDESEAWCS_Tasks.StackerCraneJob; namespace WIDESEAWCS_Tasks @@ -41,14 +43,16 @@ private readonly ITaskRepository _taskRepository; private readonly IRouterService _routerService; private readonly IShuttleCarService _shuttleCarService; + private readonly ICacheService _cacheService; - public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService) + public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService, ICacheService cacheService) { _taskService = taskService; _taskExecuteDetailService = taskExecuteDetailService; _taskRepository = taskRepository; _routerService = routerService; _shuttleCarService = shuttleCarService; + _cacheService = cacheService; } public Task Execute(IJobExecutionContext context) @@ -59,6 +63,10 @@ if (commonStackerCrane != null) { commonStackerCrane.Communicator.IsReadAfterWrite = false; + #region 鑾峰彇鍫嗗灈鏈轰俊鎭� + StackerCraneTaskCommandR common = ReadCustomer<StackerCraneTaskCommandR>(commonStackerCrane, commonStackerCrane.DeviceCode); + _cacheService.AddOrUpdate(commonStackerCrane.DeviceCode, common); + #endregion #region 淇″彿浜や簰澶勭悊 //Heartbeat(commonStackerCrane); ShuttleCarSignal(commonStackerCrane); @@ -66,7 +74,7 @@ #region 浠诲姟瀹屾垚 var completeStatus = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CompleteStatus); - if (completeStatus == 2 || completeStatus == 3) + if (common.CompleteStatus == 2 || common.CompleteStatus == 3) { NormalCompleted(commonStackerCrane); } -- Gitblit v1.9.3