From 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.cs | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.cs
index dc96769..6540935 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.cs
@@ -10,26 +10,62 @@
this.gridView1.OptionsView.ShowGroupPanel = false;
}
- private List<PipeLineMatchingViewModel> _allBindingList = null;
+ private List<PipeLineFormViewModel> _allBindingList = new List<PipeLineFormViewModel>();
- public List<PipeLineMatchingViewModel> SetBindingData(List<PipeLineMatchingViewModel> inputs, List<AdaptingManageVmo> alllist)
+ /// <summary>
+ /// 鐐瑰嚮浜嬩欢
+ /// </summary>
+ public event Action<string> RowClickEvent;
+
+ public void SetBindingData(List<PipeLineMatchingViewModel> pipeLineMatchingViewModels)
{
+ if (pipeLineMatchingViewModels != null)
+ {
+ foreach (var item in pipeLineMatchingViewModels)
+ {
+ _allBindingList.Add(new PipeLineFormViewModel(item));
+ }
+ this.pipeLineFormViewModelBindingSource.DataSource = _allBindingList;
+ }
+ }
+
+ public List<PipeLineMatchingViewModel> SetMatching(List<PipeLineMatchingViewModel> inputs, List<PipeLineManageVmo> alllist)
+ {
+ if (inputs == null)
+ {
+ return null;
+ }
var finishList = new List<PipeLineMatchingViewModel>();
foreach (var item in inputs)
{
- var result = AsstesAutoMatchingHelper.AutoMatching(item, alllist);
+ var result = AssetsMatchingHelper.MatchingPipes(item, alllist);
if (result != null)
{
finishList.Add(result);
}
else
{
+ finishList.Add(item);
}
}
- _allBindingList = finishList;
- this.pipeLineMatchingViewModelBindingSource.DataSource = _allBindingList;
- this.pipeLineMatchingViewModelBindingSource.ResetBindings(false);
+ _allBindingList.Clear();
+ foreach (var item in finishList)
+ {
+ _allBindingList.Add(new PipeLineFormViewModel(item));
+ }
+ this.pipeLineFormViewModelBindingSource.ResetBindings(false);
return finishList;
}
+
+ //琛岀偣鍑讳簨浠�
+ private void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
+ {
+ var row = this.gridView1.GetCurrentViewModel(_allBindingList);
+ if (row == null)
+ {
+ return;
+ }
+ this.RowClickEvent?.Invoke(row.Code);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3