From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
similarity index 89%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
index c0b86fe..96c9ed3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
@@ -44,9 +44,12 @@
_allBindingList = new List<ExchangerSingleMatchingViewModel>();
_ExchangerBll = new BLL.AssetsExchangerMain();
var allAssetsPumpMain = await _ExchangerBll.GetAll();
- foreach (var Main in allAssetsPumpMain)
+ if (allAssetsPumpMain != null)
{
- _allBindingList.Add(new ExchangerSingleMatchingViewModel(Main));
+ foreach (var Main in allAssetsPumpMain)
+ {
+ _allBindingList.Add(new ExchangerSingleMatchingViewModel(Main));
+ }
}
this.ExchangerSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
this.searchControl1.Text = _pumpMatchingViewModel.ModelType;
@@ -72,10 +75,10 @@
{
_pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
_pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
- /* _pumpMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
- _pumpMatchingViewModel.MatchingMaterial = vm.Material;
- _pumpMatchingViewModel.MatchingExchangerType = (eExchangerType?)vm.SeriesType;
- _pumpMatchingViewModel.MatchingExchangerSetting = vm.ExchangerSetting;*/
+ /* _valveMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
+ _valveMatchingViewModel.MatchingMaterial = vm.Material;
+ _valveMatchingViewModel.MatchingExchangerType = (eExchangerType?)vm.SeriesType;
+ _valveMatchingViewModel.MatchingExchangerSetting = vm.ExchangerSetting;*/
var list = await _bll_ex.Value.GetByMainID(vm.ID);
if (list != null && list.Any())
{
--
Gitblit v1.9.3