From 5dbe0ca9fe177aa83779ebad921b5d1d2cae6278 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 11 九月 2024 17:44:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductMainPanel.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductMainPanel.cs
similarity index 92%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductMainPanel.cs
index fa2d2c0..f3b46cb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/PumpProductMainPanel.cs
@@ -14,7 +14,7 @@
this.gridView1.SetNormalView();
this.gridView1.RegistCustomDrawRowIndicator();
this.pumpSeriesTreeListCtrl1.FocusedChangedEvent += PumpSeriesTreeListCtrl1_FocusedChangedEvent;
- this.pumpSeriesTreeListCtrl1.AddPumpMain += BtnAdd_ItemClick;
+ this.pumpSeriesTreeListCtrl1.AddPumpMain += BtnAdd_ItemClickAsync;
}
private readonly List<PumpMainViewModel> _allBindingList = new();
@@ -70,7 +70,7 @@
}
//澧炲姞
- private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void BtnAdd_ItemClickAsync(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var dlg = new AddPumpProductMainDlg();
//绯诲垪ID
@@ -80,13 +80,16 @@
return;
}
var groupid = this.pumpSeriesTreeListCtrl1.GetCurrentGroupID();
- Vmo.PumpGroupAndMainMap map = null;
+ Vmo.PumpGroupAndMainMapVmo map = null;
if (groupid > 0)
{
- map = new Vmo.PumpGroupAndMainMap();
+ map = new Vmo.PumpGroupAndMainMapVmo();
map.PumpGroupID = groupid;
}
- dlg.SetBindingData(id);
+ var pumpseries = await new BLL.PumpSeries().GetByID(id);
+ if (pumpseries == null)
+ return;
+ dlg.SetBindingData(pumpseries);
dlg.ReloadDataEvent += async (main) =>
{
var id = await _bll.InsertEx(main, map);
@@ -103,7 +106,7 @@
}
//淇敼
- private void BtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void BtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var currentVm = this.gridView1.GetCurrentViewModel(_allBindingList);
if (currentVm == null)
@@ -112,7 +115,10 @@
return;
}
var dlg = new EditPumpProductMainDlg();
- dlg.SetBindingData(currentVm.ID);
+ var model = await new BLL.PumpMain().GetByID(currentVm.ID);
+ if (model == null)
+ return;
+ dlg.SetBindingData(model);
dlg.ReloadDataEvent += async (rhs) =>
{
if (await _bll.Update(rhs))
@@ -198,7 +204,7 @@
return;
}
var dlg = new EditPumpPartPropDlg();
- // var pumpmain = currentVm.Model as Vmo.PumpMain;
+ // var pumpmain = currentVm.Model as Vmo.PumpMainVmo;
dlg.SetBindingData(currentVm.Model);
dlg.ReloadEvent += async (part, content, map) =>
{
--
Gitblit v1.9.3