From 208ca42e1c20afafbe48d66259d553ee81eb48ed Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 13 十一月 2024 11:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/03-coefficient/SetExchangerCoefficientDlg.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/SetValveCoefficientDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/03-coefficient/SetExchangerCoefficientDlg.cs
similarity index 70%
copy from WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/SetValveCoefficientDlg.cs
copy to WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/03-coefficient/SetExchangerCoefficientDlg.cs
index f326db7..a7e1347 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/SetValveCoefficientDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/03-coefficient/SetExchangerCoefficientDlg.cs
@@ -4,26 +4,29 @@
namespace HStation.WinFrmUI
{
- public partial class SetElbowCoefficientDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SetExchangerCoefficientDlg : DevExpress.XtraEditors.XtraForm
{
- public SetElbowCoefficientDlg()
+ public SetExchangerCoefficientDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
}
- private BLL.AssetsElbowCoefficient _bll = null;
+ private BLL.AssetsExchangerCoefficient _bll = null;
- private List<ElbowCoefficientViewModel> _allBindingList = null;
+ private List<ExchangerCoefficientViewModel> _allBindingList = null;
public async void SetBindingData()
{
- _bll = new BLL.AssetsElbowCoefficient();
+ _bll = new BLL.AssetsExchangerCoefficient();
var alllist = await _bll.GetAll();
- _allBindingList = new List<ElbowCoefficientViewModel>();
- foreach (var item in alllist)
+ _allBindingList = new List<ExchangerCoefficientViewModel>();
+ if (alllist != null)
{
- _allBindingList.Add(new ElbowCoefficientViewModel(item));
+ foreach (var item in alllist)
+ {
+ _allBindingList.Add(new ExchangerCoefficientViewModel(item));
+ }
}
this.sysPropChoiceViewModelBindingSource.DataSource = _allBindingList;
this.sysPropChoiceViewModelBindingSource.ResetBindings(false);
@@ -32,10 +35,10 @@
//瀹屾垚
private async void BtnOk_Click(object sender, EventArgs e)
{
- var allList = new List<Vmo.AssetsElbowCoefficientVmo>();
+ var allList = new List<Vmo.AssetsExchangerCoefficientVmo>();
foreach (var item in _allBindingList)
{
- allList.Add(new Vmo.AssetsElbowCoefficientVmo { ID = item.ID, Name = item.Name, Caliber = item.Caliber, Material = item.Material, MinorLoss = item.MinorLoss });
+ allList.Add(new Vmo.AssetsExchangerCoefficientVmo { ID = item.ID, Name = item.Name, Caliber = item.Caliber, Material = item.Material, MinorLoss = item.MinorLoss });
}
if (await _bll.DeleteAll())
{
--
Gitblit v1.9.3