From a906f71640d9ba5cd9f8d689a51de3a557d8bbff Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 14 三月 2025 17:37:10 +0800
Subject: [PATCH] 完善成套设备界面问题
---
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs
index 82629fd..b68e62b 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs
@@ -30,22 +30,25 @@
private async void GroupTreeListCtrl1_ReloadEvent(long catalogueID)
{
_allBindingList.Clear();
- var model = await new PBS.BLL.WE.CatalogueMapping().GetByCatalogueID(catalogueID);
- if (model != null)
+ var modelList = await new PBS.BLL.WE.CatalogueMapping().GetByCatalogueID(catalogueID);
+ if (modelList != null)
{
- var itemModel = await _bll.GetByID(model.ItemID);
- if (itemModel != null)
+ foreach (var model in modelList)
{
- var utensilList = await new PBS.BLL.WE.UtensilMapping().GetByItemID(itemModel.ID);
- if (utensilList != null)
+ var itemModel = await _bll.GetByID(model.ItemID);
+ if (itemModel != null)
{
- _allBindingList.Clear();
- foreach (var item in utensilList)
+ var utensilList = await new PBS.BLL.WE.UtensilMapping().GetByItemID(itemModel.ID);
+ if (utensilList != null)
{
- var utensil = await new PBS.BLL.WE.Utensil().GetByID(item.UtensilID);
- if (utensil != null)
+ //_allBindingList.Clear();
+ foreach (var item in utensilList)
{
- _allBindingList.Add(new ItemViewModel(itemModel, item, utensil.Name));
+ var utensil = await new PBS.BLL.WE.Utensil().GetByID(item.UtensilID);
+ if (utensil != null)
+ {
+ _allBindingList.Add(new ItemViewModel(itemModel, item, utensil.Name));
+ }
}
}
}
@@ -97,16 +100,18 @@
PBS.Vmo.WE.ItemVmo itemVmo = null;
if (model != null)
{
- itemVmo = await new PBS.BLL.WE.Item().GetByID(model.ItemID);
+ //itemVmo = await new PBS.BLL.WE.Item().GetByID(model);
}
dlg.SetBindingData(itemVmo, catalogueID);
dlg.ReloadDataEvent += async (item, catalogue, mappingList) =>
{
+ //鐜板湪榛樿鍙兘澧炲姞锛屼笉鑳界紪杈�
if (itemVmo == null)
{
var id = await _bll.Insert(item);
if (id > 0)
{
+ item.ID = id;
catalogue.ItemID = id;
var cataID = await new PBS.BLL.WE.CatalogueMapping().Insert(catalogue);
if (cataID > 0)
@@ -161,23 +166,38 @@
}
//鍒犻櫎
- private void barBtnDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- /* var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
- if (vm == null)
- {
- MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
- return;
- }
- if (MessageBoxHelper.IsClickOk($"纭鍒犻櫎鏁版嵁琛�?"))
- return;
- if (_bllWaterEquivalent.DeleteByID(vm.UserID, out string msg))
- {
- MessageBoxHelper.ShowSuccess("鍒犻櫎鎴愬姛!");
- _allBindingList.Remove(vm);
- this.currentViewModelBindingSource.ResetBindings(false);
- }
- else MessageBoxHelper.ShowError($"鍒犻櫎澶辫触!\n{msg}");*/
+ var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
+ if (vm == null)
+ {
+ MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
+ return;
+ }
+ if (MessageBoxHelper.IsClickOk($"纭鍒犻櫎鏁版嵁琛�?"))
+ return;
+ if (await _bll.DeleteByID(vm.ID))
+ {
+ MessageBoxHelper.ShowSuccess("鍒犻櫎鎴愬姛!");
+ _allBindingList.Remove(vm);
+ this.itemViewModelBindingSource.ResetBindings(false);
+ }
+ else MessageBoxHelper.ShowError($"鍒犻櫎澶辫触!");
+ }
+
+ //璇︾粏淇℃伅
+ private void BtnInfo_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
+ if (vm == null)
+ {
+ TipFormHelper.ShowWarn("璇疯緭鍏ユ暟鎹锛�");
+ return;
+ }
+
+ var dlg = new EditWaterWEDlg();
+ dlg.SetInfoDisplay(vm);
+ dlg.ShowDialog();
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3