From b0944e2f380a3d538e6cc740673ea49c67abfebf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 22 十月 2024 16:33:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
index 849604b..3120036 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
@@ -11,7 +11,7 @@
/// <summary>
/// 鍒涘缓璧勪骇鑷姩鍖归厤ViewModel
/// </summary>
- public static AssetsMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo)
+ public static AssetsMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -20,22 +20,22 @@
var input = new AssetsMatchingViewModel();
//姘存车
- input.PumpMatchingList = hydroInfo.Pumps?.Select(x => Create(hydroInfo, x)).ToList();
+ input.PumpMatchingList = hydroInfo.Pumps?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();
//闃�闂�
- input.ValveMatchingList = hydroInfo.Valves?.Select(x => Create(hydroInfo, x)).ToList();
+ input.ValveMatchingList = hydroInfo.Valves?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();
//绠￠亾
- input.PipeMatchingList = hydroInfo.Pipes?.Select(x => Create(hydroInfo, x)).ToList();
+ input.PipeMatchingList = hydroInfo.Pipes?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();
//寮ご
- input.ElbowMatchingList = hydroInfo.Elbows?.Select(x => Create(hydroInfo, x)).ToList();
+ input.ElbowMatchingList = hydroInfo.Elbows?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();
//涓夐��
- input.ThreelinkMatchingList = hydroInfo.Threelinks?.Select(x => Create(hydroInfo, x)).ToList();
+ input.ThreelinkMatchingList = hydroInfo.Threelinks?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();
//鍥涢��
- input.FourlinkMatchingList = hydroInfo.Fourlinks?.Select(x => Create(hydroInfo, x)).ToList();
+ input.FourlinkMatchingList = hydroInfo.Fourlinks?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();
return input;
}
@@ -43,7 +43,7 @@
/// <summary>
/// 鍒涘缓娉佃嚜鍔ㄥ尮閰峍iewModel
/// </summary>
- public static PumpMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo pumpInfo)
+ public static PumpMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo pumpInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -53,26 +53,13 @@
{
return default;
}
- return new PumpMatchingViewModel()
- {
- ID = pumpInfo.ID,
- Code = pumpInfo.Code,
- Name = pumpInfo.Name,
- DbLocked = pumpInfo.DbLocked,
- ModelType = pumpInfo.ModelType,
- DbId = pumpInfo.DbId,
- CurveDbId = hydroInfo.Curves?.Find(t => t.Code == pumpInfo.CurveQH)?.DbId,
- RatedP = pumpInfo.RatedP,
- RatedH = pumpInfo.RatedH,
- RatedN = pumpInfo.RatedN,
- RatedQ = pumpInfo.RatedQ,
- };
+ return new PumpMatchingViewModel(pumpInfo, hydroInfo, allCalcuResultList);
}
/// <summary>
/// 鍒涘缓闃�闂ㄨ嚜鍔ㄥ尮閰峍iewModel
/// </summary>
- public static ValveMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroValveInfo valveInfo)
+ public static ValveMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroValveInfo valveInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -100,7 +87,7 @@
/// <summary>
/// 鍒涘缓绠￠亾鑷姩鍖归厤ViewModel
/// </summary>
- public static PipeMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPipeInfo pipeInfo)
+ public static PipeMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPipeInfo pipeInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -129,7 +116,7 @@
/// <summary>
/// 鍒涘缓寮ご鑷姩鍖归厤ViewModel
/// </summary>
- public static ElbowMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroElbowInfo elbowInfo)
+ public static ElbowMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroElbowInfo elbowInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -156,7 +143,7 @@
/// <summary>
/// 鍒涘缓涓夐�氳嚜鍔ㄥ尮閰峍iewModel
/// </summary>
- public static ThreelinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroThreelinkInfo threelinkInfo)
+ public static ThreelinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroThreelinkInfo threelinkInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -183,7 +170,7 @@
/// <summary>
/// 鍒涘缓鍥涢�氳嚜鍔ㄥ尮閰峍iewModel
/// </summary>
- public static FourlinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFourlinkInfo fourlinkInfo)
+ public static FourlinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFourlinkInfo fourlinkInfo, List<IHydroCalcuResult> allCalcuResultList)
{
if (hydroInfo == null)
{
@@ -309,6 +296,7 @@
pump.RatedQ = matching.RatedQ;
pump.RatedH = matching.RatedH;
pump.RatedN = matching.RatedN;
+ pump.RatedHz = matching.RatedHz;
if (!pump.DbLocked)
{
--
Gitblit v1.9.3