From ddea52cb5c957705b1ed4e004de65e1a3f5ad129 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 27 九月 2024 15:04:22 +0800
Subject: [PATCH] elbows修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/AssetsMatchingViewModel.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs | 7 +++----
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs | 6 +++---
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
index 5cf3861..f95086b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -64,7 +64,7 @@
}
}
//寮ご鍖归厤
- foreach (var item in assetsAutoMatchingView.ElbowsMatchingList)
+ foreach (var item in assetsAutoMatchingView.ElbowMatchingList)
{
if (MatchingElbow(item, allAdapting))
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
index ad6f5bf..b62dcb2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
@@ -19,7 +19,6 @@
}
var input = new AssetsMatchingViewModel();
-
//姘存车
input.PumpMatchingList = hydroInfo.Pumps?.Select(x => Create(hydroInfo, x)).ToList();
@@ -30,7 +29,7 @@
input.PipeMatchingList = hydroInfo.Pipes?.Select(x => Create(hydroInfo, x)).ToList();
//寮ご
- input.ElbowsMatchingList = hydroInfo.Elbows?.Select(x => Create(hydroInfo, x)).ToList();
+ input.ElbowMatchingList = hydroInfo.Elbows?.Select(x => Create(hydroInfo, x)).ToList();
//涓夐��
input.ThreelinkMatchingList = hydroInfo.Threelinks?.Select(x => Create(hydroInfo, x)).ToList();
@@ -474,11 +473,11 @@
}
//寮ご
- if (output.ElbowsMatchingList != null && output.ElbowsMatchingList.Count > 0)
+ if (output.ElbowMatchingList != null && output.ElbowMatchingList.Count > 0)
{
if (hydroInfo.Elbows != null && hydroInfo.Elbows.Count > 0)
{
- foreach (var elbowsMatching in output.ElbowsMatchingList)
+ foreach (var elbowsMatching in output.ElbowMatchingList)
{
var elbows = hydroInfo.Elbows.Find(x => x.Code == elbowsMatching.Code);
if (elbows != null)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
index 05e882f..5ee8e15 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
@@ -35,7 +35,7 @@
public async void SetBindingData(AssetsMatchingViewModel inputViewModel)
{
_assetsAutoMatching = inputViewModel;
- this.elbowsMatchingCtrl1.SetBindingData(inputViewModel.ElbowsMatchingList);
+ this.elbowsMatchingCtrl1.SetBindingData(inputViewModel.ElbowMatchingList);
this.pipeLineMatchingCtrl1.SetBindingData(inputViewModel.PipeMatchingList);
this.pumpMatchingCtrl1.SetBindingData(inputViewModel.PumpMatchingList);
this.threeLinkMatchingCtrl1.SetBindingData(inputViewModel.ThreelinkMatchingList);
@@ -71,12 +71,12 @@
//闃�闂ㄥ尮閰�
var valveMatching = this.valveMatchingCtrl1.SetMatching(input.ValveMatchingList, allValve);
//寮ご鍖归厤
- var elbowsMatching = this.elbowsMatchingCtrl1.SetMatching(input.ElbowsMatchingList, allAdapting);
+ var elbowsMatching = this.elbowsMatchingCtrl1.SetMatching(input.ElbowMatchingList, allAdapting);
assetsAutoMatching.PumpMatchingList = pumpMatching;
assetsAutoMatching.ThreelinkMatchingList = threeLinkMatching;
assetsAutoMatching.FourlinkMatchingList = fourLinkMatching;
- assetsAutoMatching.ElbowsMatchingList = elbowsMatching;
+ assetsAutoMatching.ElbowMatchingList = elbowsMatching;
assetsAutoMatching.PipeMatchingList = pipeLineMatching;
assetsAutoMatching.ValveMatchingList = valveMatching;
return assetsAutoMatching;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/AssetsMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/AssetsMatchingViewModel.cs
index e71d414..4abc73f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/AssetsMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/AssetsMatchingViewModel.cs
@@ -23,7 +23,7 @@
/// <summary>
/// 寮ご鍒楄〃
/// </summary>
- public List<ElbowMatchingViewModel> ElbowsMatchingList { get; set; }
+ public List<ElbowMatchingViewModel> ElbowMatchingList { get; set; }
/// <summary>
/// 涓夐�氬垪琛�
--
Gitblit v1.9.3