From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.cs
index 20d6501..6f4aec9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.cs
@@ -15,15 +15,15 @@
private List<PropGroupChoiceViewModel> _proplist = null;
- private Vmo.PumpMainVmo _PumpMain = null; //娉靛瀷鍙�
+ private Vmo.AssetsPumpMainVmo _AssetsPumpMain = null; //娉靛瀷鍙�
- public async void SetBindingData(Vmo.PumpSeriesVmo pumpSeriesVmo)
+ public async void SetBindingData(Vmo.AssetsPumpSeriesVmo AssetsPumpSeriesVmo)
{
- _PumpMain = new Vmo.PumpMainVmo();
- _PumpMain.PumpSeriesID = pumpSeriesVmo.ID;
+ _AssetsPumpMain = new Vmo.AssetsPumpMainVmo();
+ _AssetsPumpMain.PumpSeriesID = AssetsPumpSeriesVmo.ID;
}
- public event Func<Vmo.PumpMainVmo, Task<bool>> ReloadDataEvent = null;
+ public event Func<Vmo.AssetsPumpMainVmo, Task<bool>> ReloadDataEvent = null;
//鏁版嵁楠岃瘉
private bool Valid()
@@ -57,49 +57,49 @@
{
if (!(Valid()))
return;
- _PumpMain.Name = TextEditName.Text.Trim();
- _PumpMain.TagName = TextEditTagName.Text.Trim();
+ _AssetsPumpMain.Name = TextEditName.Text.Trim();
+ _AssetsPumpMain.TagName = TextEditTagName.Text.Trim();
double ratedFlow;
double.TryParse(TextEditRatedFlow.Text.Trim(), out ratedFlow);
- _PumpMain.RatedFlow = ratedFlow;
+ _AssetsPumpMain.RatedFlow = ratedFlow;
double ratedHead;
double.TryParse(TextEditRatedHead.Text.Trim(), out ratedHead);
- _PumpMain.RatedHead = ratedHead;
+ _AssetsPumpMain.RatedHead = ratedHead;
double ratedSpeed;
double.TryParse(TextEditRatedSpeed.Text.Trim(), out ratedSpeed);
- _PumpMain.RatedSpeed = ratedSpeed;
- _PumpMain.Description = DescriptionTextEdit.Text.Trim();
+ _AssetsPumpMain.RatedSpeed = ratedSpeed;
+ _AssetsPumpMain.Description = DescriptionTextEdit.Text.Trim();
double d2;
if (double.TryParse(TextEditD2.Text.Trim(), out d2))
{
- _PumpMain.D2 = d2;
+ _AssetsPumpMain.D2 = d2;
}
else
{
- _PumpMain.D2 = null;
+ _AssetsPumpMain.D2 = null;
}
if (double.TryParse(TextEditErosion.Text.Trim(), out double erosion))
{
- _PumpMain.Erosion = erosion;
+ _AssetsPumpMain.Erosion = erosion;
}
else
{
- _PumpMain.Erosion = null;
+ _AssetsPumpMain.Erosion = null;
}
if (double.TryParse(TextEditRatedPower.Text.Trim(), out double ratedPower))
{
- _PumpMain.RatedPower = ratedPower;
+ _AssetsPumpMain.RatedPower = ratedPower;
}
if (double.TryParse(TextEditRatedeffciency.Text.Trim(), out double ratedEfficiency))
{
- _PumpMain.RatedEfficiency = ratedEfficiency;
+ _AssetsPumpMain.RatedEfficiency = ratedEfficiency;
}
else
{
- _PumpMain.RatedEfficiency = null;
+ _AssetsPumpMain.RatedEfficiency = null;
}
- if (await this.ReloadDataEvent.Invoke(_PumpMain))
+ if (await this.ReloadDataEvent.Invoke(_AssetsPumpMain))
{
MessageBoxHelper.ShowSuccess("娣诲姞鎴愬姛!");
}
--
Gitblit v1.9.3