From 02e4dbb45ac38646a0cd364dd48d4b06e1ffa899 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Tue, 31 Oct 2023 17:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E8=B4=A7=E7=A1=AE=E8=AE=A4=EF=BC=8C?= =?UTF-8?q?=E7=94=B5=E6=A2=AF=E5=85=B3=E9=97=A8=E9=80=BB=E8=BE=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/BaseWareHouseService.cs | 4 ++-- .../BaseWareHouseService`1.cs | 4 ++-- .../Tnb.WarehouseMgr/DeviceProviderService.cs | 22 ++++++++----------- .../TaskStatusChangeSubscriber.cs | 2 +- .../Constants/EventSubscribeEventConsts.cs | 2 +- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index b36c6f0a..6b943716 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -56,7 +56,7 @@ namespace Tnb.WarehouseMgr private static Lazy> _stroageMapLazy; private static Dictionary _storeMap = new(StringComparer.OrdinalIgnoreCase); public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); - + private IEventPublisher _eventPublisher; protected IEventPublisher EventPublisher @@ -170,7 +170,7 @@ namespace Tnb.WarehouseMgr [NonAction] protected async Task Publish(string taskName) { - await _eventPublisher.PublishAsync(new TaskStatusChangeSource(EventSubscribeEventConsts.TaskStatusChangeEventId, taskName)); + await _eventPublisher.PublishAsync(new TaskStatusChangeSource(EventSubscribeEventConsts.TASKSTATUSCHANGE_EVENTID, taskName)); } [NonAction] diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService`1.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService`1.cs index 13ef3e0e..cf34cf50 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService`1.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService`1.cs @@ -11,7 +11,7 @@ using Tnb.WarehouseMgr.Entities; namespace Tnb.WarehouseMgr { - public class BaseWareHouseService : BaseWareHouseService + public class BaseWareHouseService : BaseWareHouseService { protected static Dictionary _elevatorMap = new Dictionary(); @@ -21,7 +21,7 @@ namespace Tnb.WarehouseMgr { Task.Run(async () => { - _elevatorMap = await db.Queryable().ToDictionaryAsync(x =>x.elevator_id,x=>x.elevator_code); + _elevatorMap = await db.Queryable().ToDictionaryAsync(x => x.elevator_id, x => x.elevator_code); }); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs index 53b0c000..3cf585b2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs @@ -166,12 +166,13 @@ namespace Tnb.WarehouseMgr throw new Exception($"根据参数,sourceName:{input.sourceName},taskCode:{input.taskCode},未找到匹配的电梯任务"); if (_elevatorMap.TryGetValue(elevator.elevator_id, out var elevatorCode)) { - (int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(_eleCtlCfg.DevName, CancellationToken.None);//elevator.elevator_code + var devName = elevatorCode?.ToString() ?? _eleCtlCfg.DevName; + (int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus) = await _elevatorControlService.GetElevatorStatus(devName, CancellationToken.None);//elevator.elevator_code Logger.Information($"电梯当前状态->系统状态:{sysStatus.ToEnum().ToString()},运行状态:{runStatus},门状态:{doorStatus},Agv状态:{agvStatus},当前楼层：{floorNo}"); //判断Agv电梯是否进入状态 if (agvStatus != (int)EnumAgvStatus.AGV运行状态) { - await _elevatorControlService.WriteTagAsync(_eleCtlCfg.DevName, ElevatorConsts.AGVControl, 1); + await _elevatorControlService.WriteTagAsync(devName, ElevatorConsts.AGVControl, 1); } Logger.Information("目前正常"); @@ -179,7 +180,7 @@ namespace Tnb.WarehouseMgr //电梯到达目标楼层后，判断当前电梯门状态是否为开门到位保持状态 if (doorStatus != (int)EnumDoorStatus.开门到位保持) { - await _elevatorControlService.SendOpenCloseCmd(_eleCtlCfg.DevName, 3); //发送电梯前门开门指令 + await _elevatorControlService.SendOpenCloseCmd(devName, 3); //发送电梯前门开门指令 } if (sysStatus == (int)EnumSysStatus.正常状态 && runStatus == (int)EnumRunStatus.停梯 && doorStatus == (int)EnumDoorStatus.开门到位保持) @@ -201,7 +202,7 @@ namespace Tnb.WarehouseMgr } } - + return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！"); @@ -298,16 +299,11 @@ namespace Tnb.WarehouseMgr if (elevatorQueueItem != null) { Logger.Information("开始进入关门流程"); - - var disTask = disTasks.Find(x => x.id == elevatorQueueItem.distask_id); - //if (disTask?.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID) + var doorStatus = await _elevatorControlService.GetTagAsync(elevatorQueueItem.elevator_code, ElevatorConsts.DoorStatus); + if (doorStatus.ToEnum() != EnumDoorStatus.关门到位保持) { - var doorStatus = await _elevatorControlService.GetTagAsync(_eleCtlCfg.DevName, ElevatorConsts.DoorStatus); - if (doorStatus.ToEnum() != EnumDoorStatus.关门到位保持) - { - await _elevatorControlService.SendOpenCloseCmd(elevatorQueueItem.elevator_code, 4); //向电梯发送前门关门指令 - await _db.Deleteable(elevatorQueueItem).ExecuteCommandAsync(); - } + await _elevatorControlService.SendOpenCloseCmd(elevatorQueueItem.elevator_code, 4); //向电梯发送前门关门指令 + await _db.Deleteable(elevatorQueueItem).ExecuteCommandAsync(); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/EventSubscribers/TaskStatusChangeSubscriber.cs b/WarehouseMgr/Tnb.WarehouseMgr/EventSubscribers/TaskStatusChangeSubscriber.cs index c74e3044..bffd6179 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/EventSubscribers/TaskStatusChangeSubscriber.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/EventSubscribers/TaskStatusChangeSubscriber.cs @@ -32,7 +32,7 @@ public class TaskStatusChangeSubscriber : IEventSubscriber, ISingleton /// /// /// - [EventSubscribe(EventSubscribeEventConsts.TaskStatusChangeEventId)] + [EventSubscribe(EventSubscribeEventConsts.TASKSTATUSCHANGE_EVENTID)] public async Task Excute(EventHandlerExecutingContext context) { var tscSource = (TaskStatusChangeSource)context.Source; diff --git a/common/Tnb.Common.Core/EventBus/Constants/EventSubscribeEventConsts.cs b/common/Tnb.Common.Core/EventBus/Constants/EventSubscribeEventConsts.cs index 7e2dc1a8..6203f9ef 100644 --- a/common/Tnb.Common.Core/EventBus/Constants/EventSubscribeEventConsts.cs +++ b/common/Tnb.Common.Core/EventBus/Constants/EventSubscribeEventConsts.cs @@ -11,7 +11,7 @@ namespace Tnb.Common.Core.EventBus.Constants /// /// 预任务执行EventId /// - public const string TaskStatusChangeEventId = "DisTask:TaskStatusChange"; + public const string TASKSTATUSCHANGE_EVENTID = "DisTask:TaskStatusChange"; } }