From 30e078df2eae453b8ea39680816d5abbf5c51b25 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 14:01:07 +0800
Subject: [PATCH] Xhs匹配改造，有错误
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
similarity index 67%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
index 634cc5e..be17132 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI.Xhs
{
- public partial class AssetsMainChoicePage : DevExpress.XtraEditors.XtraUserControl
+ public partial class XhsProjectSimulationMatchingListCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public AssetsMainChoicePage()
+ public XhsProjectSimulationMatchingListCtrl()
{
InitializeComponent();
this.elbowsMatchingCtrl1.RowClickEvent += RowClickEvent;
@@ -20,7 +20,7 @@
public event Action<string> FormRowClickEvent = null;
- public event Func<AssetsAutoMatchingViewModel, bool> RelaodEvent = null;
+ public event Func<AssetsMatchingViewModel, bool> RelaodEvent = null;
private BLL.PumpMain _pumpMain = null;
@@ -30,24 +30,24 @@
private BLL.ValveMain _valveMain = null;
- private AssetsAutoMatchingViewModel _assetsAutoMatching = null;
+ private AssetsMatchingViewModel _assetsAutoMatching = null;
- public async void SetBindingData(AssetsAutoMatchingViewModel inputViewModel)
+ public async void SetBindingData(AssetsMatchingViewModel inputViewModel)
{
_assetsAutoMatching = inputViewModel;
- this.elbowsMatchingCtrl1.SetBindingData(inputViewModel.ElbowsMatchingModels);
- this.pipeLineMatchingCtrl1.SetBindingData(inputViewModel.PipeLineMatchingModels);
- this.pumpMatchingCtrl1.SetBindingData(inputViewModel.PumpMatchingModels);
- this.threeLinkMatchingCtrl1.SetBindingData(inputViewModel.ThreeLinkMatchingModels);
- this.fourLinkMatchingCtrl1.SetBindingData(inputViewModel.FourLinkMatchingModels);
- this.valveMatchingCtrl1.SetBindingData(inputViewModel.ValveMatchingModels);
+ this.elbowsMatchingCtrl1.SetBindingData(inputViewModel.ElbowsMatchingList);
+ this.pipeLineMatchingCtrl1.SetBindingData(inputViewModel.PipeMatchingList);
+ this.pumpMatchingCtrl1.SetBindingData(inputViewModel.PumpMatchingList);
+ this.threeLinkMatchingCtrl1.SetBindingData(inputViewModel.ThreelinkMatchingList);
+ this.fourLinkMatchingCtrl1.SetBindingData(inputViewModel.FourlinkMatchingList);
+ this.valveMatchingCtrl1.SetBindingData(inputViewModel.ValveMatchingList);
await SetMatching(inputViewModel);
}
/// <summary>
/// 鑷姩鍖归厤
/// </summary>
- public async Task<AssetsAutoMatchingViewModel> SetMatching(AssetsAutoMatchingViewModel input)
+ public async Task<AssetsMatchingViewModel> SetMatching(AssetsMatchingViewModel input)
{
if (input == null)
return null;
@@ -59,26 +59,26 @@
var allAdapting = await _adaptingManage.GetAll();
var allPipeLine = await _pipeLineManage.GetAll();
var allValve = await _valveMain.GetAll();
- var assetsAutoMatching = new AssetsAutoMatchingViewModel();
+ var assetsAutoMatching = new AssetsMatchingViewModel();
//娉靛尮閰�
- var pumpMatching = await this.pumpMatchingCtrl1.SetMatching(input.PumpMatchingModels, allPump);
+ var pumpMatching = await this.pumpMatchingCtrl1.SetMatching(input.PumpMatchingList, allPump);
//涓夐�氬尮閰�
- var threeLinkMatching = this.threeLinkMatchingCtrl1.SetMatching(input.ThreeLinkMatchingModels, allAdapting);
+ var threeLinkMatching = this.threeLinkMatchingCtrl1.SetMatching(input.ThreelinkMatchingList, allAdapting);
//鍥涢�氬尮閰�
- var fourLinkMatching = this.fourLinkMatchingCtrl1.SetMatching(input.FourLinkMatchingModels, allAdapting);
+ var fourLinkMatching = this.fourLinkMatchingCtrl1.SetMatching(input.FourlinkMatchingList, allAdapting);
//绠￠亾鍖归厤
- var pipeLineMatching = this.pipeLineMatchingCtrl1.SetMatching(input.PipeLineMatchingModels, allPipeLine);
+ var pipeLineMatching = this.pipeLineMatchingCtrl1.SetMatching(input.PipeMatchingList, allPipeLine);
//闃�闂ㄥ尮閰�
- var valveMatching = this.valveMatchingCtrl1.SetMatching(input.ValveMatchingModels, allValve);
+ var valveMatching = this.valveMatchingCtrl1.SetMatching(input.ValveMatchingList, allValve);
//寮ご鍖归厤
- var elbowsMatching = this.elbowsMatchingCtrl1.SetMatching(input.ElbowsMatchingModels, allAdapting);
+ var elbowsMatching = this.elbowsMatchingCtrl1.SetMatching(input.ElbowsMatchingList, allAdapting);
- assetsAutoMatching.PumpMatchingModels = pumpMatching;
- assetsAutoMatching.ThreeLinkMatchingModels = threeLinkMatching;
- assetsAutoMatching.FourLinkMatchingModels = fourLinkMatching;
- assetsAutoMatching.ElbowsMatchingModels = elbowsMatching;
- assetsAutoMatching.PipeLineMatchingModels = pipeLineMatching;
- assetsAutoMatching.ValveMatchingModels = valveMatching;
+ assetsAutoMatching.PumpMatchingList = pumpMatching;
+ assetsAutoMatching.ThreelinkMatchingList = threeLinkMatching;
+ assetsAutoMatching.FourlinkMatchingList = fourLinkMatching;
+ assetsAutoMatching.ElbowsMatchingList = elbowsMatching;
+ assetsAutoMatching.PipeMatchingList = pipeLineMatching;
+ assetsAutoMatching.ValveMatchingList = valveMatching;
return assetsAutoMatching;
}
--
Gitblit v1.9.3