From a72a2fafc5cd95d9fae4957d855929fabf594415 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期四, 19 九月 2024 22:56:57 +0800 Subject: [PATCH] 自动匹配修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.cs | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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-AutoMatching/AssetsMainChoicePage.cs index 4bb543b..4c71aab 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-AutoMatching/AssetsMainChoicePage.cs @@ -10,9 +10,15 @@ /// <summary> /// 鍒濆鍖� /// </summary> - public void SetMatching(AssetsAutoMatchingInputViewModel input) + public AssetsAutoMatchingInputViewModel SetMatching(AssetsAutoMatchingInputViewModel input) { - this.pumpMatchingCtrl1.SetBindingData(input.PumpMatchingModels, out List<PumpMatchingViewModel> pumpErrors); + var assetsAutoMatching = new AssetsAutoMatchingInputViewModel(); + var pumpMatching = this.pumpMatchingCtrl1.SetBindingData(input.PumpMatchingModels, out List<PumpMatchingViewModel> pumpErrors); + var threeLinkMatching = this.threeLinkMatchingCtrl1.SetBindingData(input.ThreeLinkMatchingModels); + + assetsAutoMatching.PumpMatchingModels = pumpMatching; + assetsAutoMatching.ThreeLinkMatchingModels = threeLinkMatching; + return assetsAutoMatching; } } } \ No newline at end of file -- Gitblit v1.9.3