From e9259ce8ad08dddcc23c883c04972f2752934b58 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Thu, 9 Nov 2023 10:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=EF=BC=8CAgv=E5=8F=8A=E7=94=B5=E6=A2=AF=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Configs/ElevatorControlConfiguration.cs | 1 + .../Consts/ElevatorConsts.cs | 6 ++ .../Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj | 4 ++ .../Tnb.WarehouseMgr/WareHouseService.cs | 60 ++++++++++--------- .../ElevatorControlSettings.json | 3 +- 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Configs/ElevatorControlConfiguration.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Configs/ElevatorControlConfiguration.cs index 07ec571e..c50e9373 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Configs/ElevatorControlConfiguration.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Configs/ElevatorControlConfiguration.cs @@ -20,5 +20,6 @@ /// public string WriteTagUrl { get; set; } + public string Environment { get; set; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ElevatorConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ElevatorConsts.cs index 1a440145..72a7107c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ElevatorConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ElevatorConsts.cs @@ -50,5 +50,11 @@ /// AGV心跳 /// public const string AGVKeepalive = "AGVKeepalive"; + /// + /// 运行环境名称 + /// + public const string EnvironmentName = "TIANYI"; + + } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj index 238adaa3..530924ba 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj +++ b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj @@ -9,6 +9,10 @@ Debug;Release;tianyi + + $(DefineConstants);production + + diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index f8a94183..e49a36c4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -382,38 +382,42 @@ namespace Tnb.WarehouseMgr await db.Ado.CommitTranAsync(); - //呼梯操作 - //获取目标库位为电梯库位的任务 - List<(string endlocation_code, string device_id, string id, string? start_floor)> endLocCodes = disTasks - .Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) && - !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)) - .Select(it => (it.endlocation_code, it.device_id, it.id, it.start_floor)).ToList(); - if (endLocCodes?.Count > 0) + if(_eleCtlCfg.Environment == ElevatorConsts.EnvironmentName) { - - await CallingLanding(endLocCodes); - } - //执行电梯任务 - List? elevatorTasks = disTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); - - if (elevatorTasks?.Count > 0) - { - Logger.Information($"当前电梯任务数:{elevatorTasks?.Count ?? 0}"); - Logger.Information("准备执行电梯任务"); - Logger.Information("执行电梯任务"); - - foreach (WmsDistaskH? elevatorTask in elevatorTasks) + //呼梯操作 + //获取目标库位为电梯库位的任务 + List<(string endlocation_code, string device_id, string id, string? start_floor)> endLocCodes = disTasks + .Where(it => it.endlocation_code.StartsWith("DT", StringComparison.OrdinalIgnoreCase) && + !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)) + .Select(it => (it.endlocation_code, it.device_id, it.id, it.start_floor)).ToList(); + if (endLocCodes?.Count > 0) { - await ExecuteTargetFloorTask(elevatorTask); - } + await CallingLanding(endLocCodes); + } + //执行电梯任务 + List? elevatorTasks = disTasks.Where(it => it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); + + if (elevatorTasks?.Count > 0) + { + Logger.Information($"当前电梯任务数:{elevatorTasks?.Count ?? 0}"); + Logger.Information("准备执行电梯任务"); + Logger.Information("执行电梯任务"); + + foreach (WmsDistaskH? elevatorTask in elevatorTasks) + { + await ExecuteTargetFloorTask(elevatorTask); + } + + } + ////调用AGV创建任务链接口 + List agvTasks = disTasks.Where(it => !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); + if (agvTasks?.Count > 0) + { + await AgvDispatch(agvTasks, agvCts.Token); + } } - ////调用AGV创建任务链接口 - List agvTasks = disTasks.Where(it => !it.area_code.Contains("ELE", StringComparison.OrdinalIgnoreCase)).ToList(); - if (agvTasks?.Count > 0) - { - await AgvDispatch(agvTasks, agvCts.Token); - } +# } } catch (Exception ex) when (ex is HttpRequestException hReqEx) diff --git a/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json b/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json index 33b95bee..caecf272 100644 --- a/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json +++ b/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json @@ -3,5 +3,6 @@ "token": "780BE4144636CF47DDF3920B0F1D069B", "GetTagListUrl": "http://192.168.11.110:9100/Dev/GetTagList", "GetTagUrl": "http://192.168.11.110:9100/Dev/GetTag", - "WriteTagUrl": "http://192.168.11.110:9100/Dev/writeTag" + "WriteTagUrl": "http://192.168.11.110:9100/Dev/writeTag", + "Environment": "" } \ No newline at end of file