From 21c97aab9153758bebfc9b3944859b0eec271c76 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 25 九月 2024 16:31:19 +0800
Subject: [PATCH] 一些简单的尝试
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs
index f8c8c4d..8163e8a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs
@@ -10,7 +10,7 @@
this.gridView1.OptionsView.ShowGroupPanel = false;
}
- private List<PumpMatchingViewModel> _allBindingList = null;
+ private List<PumpFormViewModel> _allBindingList = new List<PumpFormViewModel>();
/// <summary>
/// 鐐瑰嚮浜嬩欢
@@ -19,21 +19,40 @@
public void SetBindingData(List<PumpMatchingViewModel> pumpMatchingViewModel)
{
- _allBindingList = pumpMatchingViewModel;
- this.pumpMatchingViewModelBindingSource.DataSource = _allBindingList;
+ if (pumpMatchingViewModel != null)
+ {
+ foreach (var item in pumpMatchingViewModel)
+ {
+ _allBindingList.Add(new PumpFormViewModel(item));
+ }
+ }
+ this.pumpFormViewModelBindingSource.DataSource = _allBindingList;
}
public async Task<List<PumpMatchingViewModel>> SetMatching(List<PumpMatchingViewModel> pumpMatchingViewModel, List<PumpMainVmo> pumpMainVmos)
{
- List<PumpMatchingViewModel> _allBindingList = new List<PumpMatchingViewModel>();
+ var finishList = new List<PumpMatchingViewModel>();
if (pumpMatchingViewModel == null)
return null;
foreach (var item in pumpMatchingViewModel)
{
- var result = await AsstesAutoMatchingHelper.PumpMatching(item, pumpMainVmos);
+ var result = await AssetsMatchingHelper.MatchingPumps(item, pumpMainVmos);
+ if (result != null)
+ {
+ finishList.Add(result);
+ }
+ else
+ {
+ finishList.Add(item);
+ }
}
- this.pumpMatchingViewModelBindingSource.ResetBindings(false);
- return _allBindingList;
+ _allBindingList.Clear();
+ foreach (var item in finishList)
+ {
+ _allBindingList.Add(new PumpFormViewModel(item));
+ }
+ this.pumpFormViewModelBindingSource.ResetBindings(false);
+ return finishList;
}
//琛岀偣鍑讳簨浠�
--
Gitblit v1.9.3