From 7079cbb505471a8d3251cac4e27c7a3841f8e656 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 22:51:37 +0800
Subject: [PATCH] 修改单独匹配界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
index 5ee8e15..e23653a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI
{
public partial class XhsProjectSimulationMatchingListCtrl : DevExpress.XtraEditors.XtraUserControl
{
@@ -22,13 +22,13 @@
public event Func<AssetsMatchingViewModel, bool> ApplyMatchingEvent;
- private BLL.PumpMain _pumpMain = null;
+ private BLL.AssetsPumpMain _AssetsPumpMain = null;
private BLL.AdaptingManage _adaptingManage = null;
- private BLL.PipeLineManage _pipeLineManage = null;
+ private BLL.AssetsPipeMain _pipeLineManage = null;
- private BLL.ValveMain _valveMain = null;
+ private BLL.AssetsValveMain _AssetsValveMain = null;
private AssetsMatchingViewModel _assetsAutoMatching = null;
@@ -39,7 +39,14 @@
this.pipeLineMatchingCtrl1.SetBindingData(inputViewModel.PipeMatchingList);
this.pumpMatchingCtrl1.SetBindingData(inputViewModel.PumpMatchingList);
this.threeLinkMatchingCtrl1.SetBindingData(inputViewModel.ThreelinkMatchingList);
- this.fourLinkMatchingCtrl1.SetBindingData(inputViewModel.FourlinkMatchingList);
+ if (inputViewModel.FourlinkMatchingList == null || inputViewModel.FourlinkMatchingList.Count == 0)
+ {
+ tabNavigationPageFourlink.PageVisible = false;
+ }
+ else
+ {
+ this.fourLinkMatchingCtrl1.SetBindingData(inputViewModel.FourlinkMatchingList);
+ }
this.valveMatchingCtrl1.SetBindingData(inputViewModel.ValveMatchingList);
await SetMatching(inputViewModel);
}
@@ -51,27 +58,30 @@
{
if (input == null)
return null;
- _pumpMain = new BLL.PumpMain();
+ _AssetsPumpMain = new BLL.AssetsPumpMain();
_adaptingManage = new BLL.AdaptingManage();
- _pipeLineManage = new BLL.PipeLineManage();
- _valveMain = new BLL.ValveMain();
- var allPump = await _pumpMain.GetAll();
+ _pipeLineManage = new BLL.AssetsPipeMain();
+ _AssetsValveMain = new BLL.AssetsValveMain();
+ var allPump = await _AssetsPumpMain.GetAll();
var allAdapting = await _adaptingManage.GetAll();
var allPipeLine = await _pipeLineManage.GetAll();
- var allValve = await _valveMain.GetAll();
+ var allValve = await _AssetsValveMain.GetAll();
+ var allElbow = await new BLL.AssetsElbowMain().GetAll();
+ var allThreeLink = await new BLL.AssetsThreelinkMain().GetAll();
+ var allFourLink = await new BLL.AssetsFourlinkMain().GetAll();
var assetsAutoMatching = new AssetsMatchingViewModel();
//娉靛尮閰�
var pumpMatching = await this.pumpMatchingCtrl1.SetMatching(input.PumpMatchingList, allPump);
//涓夐�氬尮閰�
- var threeLinkMatching = this.threeLinkMatchingCtrl1.SetMatching(input.ThreelinkMatchingList, allAdapting);
+ var threeLinkMatching = this.threeLinkMatchingCtrl1.SetMatching(input.ThreelinkMatchingList, allThreeLink);
//鍥涢�氬尮閰�
- var fourLinkMatching = this.fourLinkMatchingCtrl1.SetMatching(input.FourlinkMatchingList, allAdapting);
+ var fourLinkMatching = this.fourLinkMatchingCtrl1.SetMatching(input.FourlinkMatchingList, allFourLink);
//绠￠亾鍖归厤
var pipeLineMatching = this.pipeLineMatchingCtrl1.SetMatching(input.PipeMatchingList, allPipeLine);
//闃�闂ㄥ尮閰�
var valveMatching = this.valveMatchingCtrl1.SetMatching(input.ValveMatchingList, allValve);
//寮ご鍖归厤
- var elbowsMatching = this.elbowsMatchingCtrl1.SetMatching(input.ElbowMatchingList, allAdapting);
+ var elbowsMatching = this.elbowsMatchingCtrl1.SetMatching(input.ElbowMatchingList, allElbow);
assetsAutoMatching.PumpMatchingList = pumpMatching;
assetsAutoMatching.ThreelinkMatchingList = threeLinkMatching;
--
Gitblit v1.9.3