From 6f8c6a3b2277b92a24319f672811da113861cfc1 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:42:30 +0800
Subject: [PATCH] 提交缺少修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.cs | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.cs
index a899e98..887b1c2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.cs
@@ -10,38 +10,60 @@
this.gridView1.OptionsView.ShowGroupPanel = false;
}
- private List<ElbowsMatchingViewModel> _allBindingList = null;
+ private List<ElbowsFormViewModel> _allBindingList = new List<ElbowsFormViewModel>();
+
+ /// <summary>
+ /// 鐐瑰嚮浜嬩欢
+ /// </summary>
+ public event Action<string> RowClickEvent;
public void SetBindingData(List<ElbowsMatchingViewModel> elbowsMatchingViewModels)
{
- if (_allBindingList != null)
+ if (elbowsMatchingViewModels != null)
{
- _allBindingList = elbowsMatchingViewModels;
- this.elbowsMatchingViewModelBindingSource.DataSource = _allBindingList;
+ foreach (var item in elbowsMatchingViewModels)
+ {
+ _allBindingList.Add(new ElbowsFormViewModel(item));
+ }
+ this.elbowsFormViewModelBindingSource.DataSource = _allBindingList;
}
}
- public List<ElbowsMatchingViewModel> SetBindingData(List<ElbowsMatchingViewModel> inputs, List<AdaptingManageVmo> alllist)
+ public List<ElbowsMatchingViewModel> SetMatching(List<ElbowsMatchingViewModel> inputs, List<AdaptingManageVmo> alllist)
{
if (inputs == null || inputs.Count == 0)
return null;
var resultList = new List<ElbowsMatchingViewModel>();
foreach (var item in inputs)
{
- var result = AsstesAutoMatchingHelper.AutoMatching(item, alllist);
+ var result = AssetsMatchingHelper.MatchingElbows(item, alllist);
if (result != null)
{
resultList.Add(result);
}
else
{
- item.MatchingType = Xhs.eMatchingType.Error;
- resultList.Add(result);
+ resultList.Add(item);
}
}
- _allBindingList = resultList;
- this.elbowsMatchingViewModelBindingSource.ResetBindings(false);
+ _allBindingList.Clear();
+ foreach (var item in resultList)
+ {
+ _allBindingList.Add(new ElbowsFormViewModel(item));
+ }
+ this.elbowsFormViewModelBindingSource.ResetBindings(false);
return resultList;
}
+
+ //琛岀偣鍑讳簨浠�
+ 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