From 4a27caa5a0d8f4eef667cc9ed0d1c01ea7329298 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 20 十二月 2024 21:47:27 +0800 Subject: [PATCH] 增加冷却塔匹配 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs index 692c781..ba84062 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs @@ -39,6 +39,7 @@ var AssetsHydrantMain = new BLL.AssetsHydrantMain(); var AssetsPressmeterMain = new BLL.AssetsPressmeterMain(); var AssetsTranslationMain = new BLL.AssetsTranslationMain(); + var AssetsCoolingMain = new BLL.AssetsCoolingMain(); try { var allPump = Task.Run(async () => await AssetsPumpMain.GetAll()).Result; @@ -58,6 +59,7 @@ var allHydrantMain = Task.Run(async () => await AssetsHydrantMain.GetAll()).Result; var allPressmeterMain = Task.Run(async () => await AssetsPressmeterMain.GetAll()).Result; var allTranslationMain = Task.Run(async () => await AssetsTranslationMain.GetAll()).Result; + var allCoolingMain = Task.Run(async () => await AssetsCoolingMain.GetAll()).Result; //娉靛尮閰� foreach (var item in assetsAutoMatchingView.Pumps) { @@ -114,6 +116,15 @@ IsMaching = true; } } + + //鍠峰ご鍖归厤 + foreach (var item in assetsAutoMatchingView.Coolings) + { + if (Matching(item, allCoolingMain)) + { + IsMaching = true; + } + } //闂峰ご鍖归厤 foreach (var item in assetsAutoMatchingView.Bluntheads) { -- Gitblit v1.9.3