From b2e753b7d889e1a1fbc17f8b43c3dd02aa0faad4 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 九月 2024 15:35:30 +0800
Subject: [PATCH] 自动匹配界面修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.cs | 19 +++++++++++++++++--
1 files changed, 17 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 a16bcda..3dc3db6 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
@@ -11,6 +11,10 @@
private BLL.AdaptingManage _adaptingManage = null;
+ private BLL.PipeLineManage _pipeLineManage = null;
+
+ private BLL.ValveMain _valveMain = null;
+
/// <summary>
/// 鍒濆鍖�
/// </summary>
@@ -18,12 +22,23 @@
{
_pumpMain = new BLL.PumpMain();
_adaptingManage = new BLL.AdaptingManage();
+ _pipeLineManage = new BLL.PipeLineManage();
+ _valveMain = new BLL.ValveMain();
var allPump = await _pumpMain.GetAll();
var allAdapting = await _adaptingManage.GetAll();
+ var allPipeLine = await _pipeLineManage.GetAll();
+ var allValve = await _valveMain.GetAll();
var assetsAutoMatching = new AssetsAutoMatchingInputViewModel();
- var pumpMatching = this.pumpMatchingCtrl1.SetBindingData(input.PumpMatchingModels, allPump, out List<PumpMatchingViewModel> pumpErrors);
+ //娉靛尮閰�
+ var pumpMatching = await this.pumpMatchingCtrl1.SetBindingData(input.PumpMatchingModels, allPump);
+ //涓夐�氬尮閰�
var threeLinkMatching = this.threeLinkMatchingCtrl1.SetBindingData(input.ThreeLinkMatchingModels, allAdapting);
-
+ //鍥涢�氬尮閰�
+ var fourLinkMatching = this.fourLinkMatchingCtrl1.SetBindingData(input.FourLinkMatchingModels, allAdapting);
+ //绠￠亾鍖归厤
+ var PipeLineMatching = this.pipeLineMatchingCtrl1.SetBindingData(input.PipeLineMatchingModels, allPipeLine);
+ //闃�闂ㄥ尮閰�
+ var ValveMatching = this.valveMatchingCtrl1.SetBindingData(input.ValveMatchingModels, allValve);
assetsAutoMatching.PumpMatchingModels = pumpMatching;
assetsAutoMatching.ThreeLinkMatchingModels = threeLinkMatching;
return assetsAutoMatching;
--
Gitblit v1.9.3