From 18225d288883a20cb7c634bda8032e1ecfee89da Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 22 十月 2024 14:14:26 +0800
Subject: [PATCH] 型号展示界面调用
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 90 +++++++++++++++++++++-----------------------
1 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
index b7e3e54..7abaef5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
@@ -12,9 +12,6 @@
{
InitializeComponent();
- this.hydroParterPropertyCtrl1.ViewCurveEvent += HydroParterPropertyCtrl1_ViewCurveEvent;
- this.hydroParterPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
- this.hydroParterPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
this.hydroParterPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
@@ -223,110 +220,109 @@
}
//鍖归厤Db
- private void HydroParterPropertyCtrl1_MatchingDbEvent(Yw.Model.HydroParterInfo parter)
+ private bool HydroParterPropertyCtrl1_MatchingDbEvent(HydroParterPropertyViewModel propertyViewModel)
{
- if (parter == null)
+ var bol = false;
+ if (propertyViewModel == null)
{
- return;
+ return bol;
}
var hydroInfo = _hydroInfoFunc?.Invoke();
if (hydroInfo == null)
{
- return;
+ return bol;
}
- switch (parter.Catalog)
+ var catalog = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogCode(propertyViewModel.Catalog);
+ switch (catalog)
{
case Yw.Hydro.ParterCatalog.Pump://姘存车
{
- var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == parter.Code);
- var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);
-
- if (!string.IsNullOrEmpty(pumpInfo.DbId))
+ var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == propertyViewModel.Code);
+ if (pumpInfo == null)
{
- var detailDlg = new PumpFullInfoViewDlg();
- detailDlg.SetBindindData(input);
- detailDlg.ShowDialog();
+ break;
}
- else
+
+ var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);
+ if (string.IsNullOrEmpty(pumpInfo.DbId))
{
var dlg = new PumpSingleMatchingDlg();
dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (rhs) =>
+ dlg.ReloadDataEvent += (output) =>
{
- var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
+ bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
if (bol)
{
- TipFormHelper.ShowSucceed("鍖归厤鎴愬姛");
+ propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
}
- else
+ };
+ dlg.ShowDialog();
+ }
+ else
+ {
+ var dlg = new PumpFullInfoViewDlg();
+ dlg.SetBindindData(input);
+ dlg.ReloadDataEvent += (output) =>
+ {
+ bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
+ if (bol)
{
- TipFormHelper.ShowWarn("鍖归厤澶辫触");
+ propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
}
};
dlg.ShowDialog();
}
}
break;
-
case Yw.Hydro.ParterCatalog.Valve://闃�闂�
{
- var valveInfo = hydroInfo.Valves?.Find(x => x.Code == parter.Code);
+ var valveInfo = hydroInfo.Valves?.Find(x => x.Code == propertyViewModel.Code);
+ if (valveInfo == null)
+ {
+ break;
+ }
var input = AssetsMatchingParasHelper.Create(hydroInfo, valveInfo);
var dlg = new ValveSingleMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (rhs) =>
{
- var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
- if (bol)
- {
- TipFormHelper.ShowSucceed("鍖归厤鎴愬姛");
- }
- else
- {
- TipFormHelper.ShowWarn("鍖归厤澶辫触");
- }
+ bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
};
dlg.ShowDialog();
}
break;
-
case Yw.Hydro.ParterCatalog.Pipe://绠￠亾
{
}
break;
-
case Yw.Hydro.ParterCatalog.Elbow://寮ご
{
- var elbowInfo = hydroInfo.Elbows?.Find(x => x.Code == parter.Code);
+ var elbowInfo = hydroInfo.Elbows?.Find(x => x.Code == propertyViewModel.Code);
+ if (elbowInfo == null)
+ {
+ break;
+ }
var input = AssetsMatchingParasHelper.Create(hydroInfo, elbowInfo);
var dlg = new ElbowSingMatchingDlg();
dlg.SetBindingData(input);
- dlg.ReloadDataEvent += (rhs) =>
+ dlg.ReloadDataEvent += (output) =>
{
- var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
- if (bol)
- {
- TipFormHelper.ShowSucceed("鍖归厤鎴愬姛");
- }
- else
- {
- TipFormHelper.ShowWarn("鍖归厤澶辫触");
- }
+ bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
};
dlg.ShowDialog();
}
break;
-
case Yw.Hydro.ParterCatalog.Threelink://涓夐��
{
}
break;
-
case Yw.Hydro.ParterCatalog.Fourlink://鍥涢��
{
}
break;
+ default: break;
}
+ return bol;
}
//寮鸿皟杩炴帴缁勪欢
--
Gitblit v1.9.3