From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductSeriesTreeListCtrl.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductSeriesTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductSeriesTreeListCtrl.cs
index 24cf5e9..eed1930 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductSeriesTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductSeriesTreeListCtrl.cs
@@ -25,10 +25,10 @@
private BindingList<CurrentTreeViewModel> _allBindingList = null;//鎵�鏈夌粦瀹氬垪琛�
- private BLL.PumpSeries _seriesbll = null;
- private BLL.PumpGroup _groupbll = null;
- private BLL.PumpType _typebll = null;
- private BLL.PumpTypeSeriesMapSeriesMap _typeSeriesMapBll = null;
+ private BLL.AssetsPumpSeries _seriesbll = null;
+ private BLL.AssetsPumpGroup _groupbll = null;
+ private BLL.AssetsPumpType _typebll = null;
+ private BLL.AssetsPumpTypeSeriesMapSeriesMap _typeSeriesMapBll = null;
/// <summary>
/// 缁戝畾鏁版嵁
@@ -45,10 +45,10 @@
/// </summary>
public async void SetBindingData()
{
- _seriesbll = new BLL.PumpSeries();
- _groupbll = new BLL.PumpGroup();
- _typebll = new BLL.PumpType();
- _typeSeriesMapBll = new BLL.PumpTypeSeriesMapSeriesMap();
+ _seriesbll = new BLL.AssetsPumpSeries();
+ _groupbll = new BLL.AssetsPumpGroup();
+ _typebll = new BLL.AssetsPumpType();
+ _typeSeriesMapBll = new BLL.AssetsPumpTypeSeriesMapSeriesMap();
_allBindingList = new BindingList<CurrentTreeViewModel>();
var allType = await _typebll.GetAll();
_allBindingList.Add(new CurrentTreeViewModel
@@ -90,14 +90,14 @@
var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (vm != null)
{
- var series = vm.Model as Vmo.PumpSeriesVmo;
+ var series = vm.Model as Vmo.AssetsPumpSeriesVmo;
if (series != null)
{
this.FocusedChangedEvent?.Invoke(series.ID, true);
}
else
{
- var group = vm.Model as Vmo.PumpGroupVmo;
+ var group = vm.Model as Vmo.AssetsPumpGroupVmo;
if (group != null)
{
this.FocusedChangedEvent?.Invoke(group.ID, false);
@@ -124,10 +124,10 @@
{
if (_allBindingList == null)
return;
- var dlg = new AddPumpTypeDlg();
+ var dlg = new AddAssetsPumpTypeDlg();
dlg.ReloadDataEvent += async (rhs) =>
{
- var bll = new BLL.PumpType();
+ var bll = new BLL.AssetsPumpType();
var id = await bll.Insert(rhs);
if (id > 0)
{
@@ -187,9 +187,9 @@
}
if (currentVm.IsGroup == false)
{
- var series = currentVm.Model as Model.PumpSeries;
+ var series = currentVm.Model as Model.AssetsPumpSeries;
var dlg = new EditPumpProductSeriesDlg();
- var model = await new BLL.PumpSeries().GetByID(currentVm.ID);
+ var model = await new BLL.AssetsPumpSeries().GetByID(currentVm.ID);
if (model == null)
return;
dlg.SetBindingData(model);
@@ -208,7 +208,7 @@
else
{
var dlg = new EditPumpProductGroupDlg();
- var GroupDto = await new BLL.PumpGroup().GetByID(currentVm.ID);
+ var GroupDto = await new BLL.AssetsPumpGroup().GetByID(currentVm.ID);
if (GroupDto == null)
return;
dlg.SetBindingData(GroupDto);
@@ -252,7 +252,7 @@
}
else
{
- var result = await BLLFactory<BLL.PumpSeries>.Instance.DeleteEx(currentVm.ID);
+ var result = await BLLFactory<BLL.AssetsPumpSeries>.Instance.DeleteEx(currentVm.ID);
if (result)
{
_allBindingList.Remove(currentVm);
@@ -288,12 +288,12 @@
dlg.SetBindingData(currentVm.ID);
dlg.ReloadDataEvent += async (model) =>
{
- var allchildList = await BLLFactory<BLL.PumpGroup>.Instance.GetAll();
+ var allchildList = await BLLFactory<BLL.AssetsPumpGroup>.Instance.GetAll();
model.SortCode = allchildList.Count == 0 ? 1 : allchildList.Max(x => x.SortCode) + 1;
var id = await _groupbll.Insert(model);
if (id > 0)
{
- var vm = await BLLFactory<BLL.PumpGroup>.Instance.GetByID(id);
+ var vm = await BLLFactory<BLL.AssetsPumpGroup>.Instance.GetByID(id);
_allBindingList.Add(new CurrentTreeViewModel(vm));
this.treeList1.Refresh();
return true;
@@ -389,7 +389,7 @@
#region 绫诲瀷鑿滃崟
//娣诲姞娉电郴鍒�
- private void BarButtonAddPumpSeries_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BarButtonAddAssetsPumpSeries_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
if (_allBindingList == null)
return;
@@ -408,7 +408,7 @@
if (id > 0)
{
var typemapid = await _typeSeriesMapBll.Insert(
- new Vmo.PumpTypeSeriesMap
+ new Vmo.AssetsPumpTypeSeriesMap
{
PumpSeriesID = id,
PumpTypeID = currentVm.ID
@@ -424,7 +424,7 @@
}
//鍒犻櫎鍒嗙被
- private async void BarButtonDeletePumpType_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void BarButtonDeleteAssetsPumpType_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (currentVm == null)
@@ -448,7 +448,7 @@
}
//缂栬緫鍒嗙被
- private void BarButtonEditPumpType_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BarButtonEditAssetsPumpType_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (currentVm == null)
@@ -456,11 +456,11 @@
TipFormHelper.ShowWarn("璇烽�夋嫨鏁版嵁琛�!");
return;
}
- var dlg = new EditPumpTypeDlg();
+ var dlg = new EditAssetsPumpTypeDlg();
dlg.SetBindingData(currentVm.ID);
dlg.ReloadDataEvent += async (rhs) =>
{
- var bll = new BLL.PumpType();
+ var bll = new BLL.AssetsPumpType();
if (await bll.Update(rhs))
{
currentVm.Reset(rhs);
@@ -476,11 +476,11 @@
#region 鍨嬪彿鑿滃崟
- public event Action<object, DevExpress.XtraBars.ItemClickEventArgs> AddPumpMain;
+ public event Action<object, DevExpress.XtraBars.ItemClickEventArgs> AddAssetsPumpMain;
- private void BarButtonAddPumpMain_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BarButtonAddAssetsPumpMain_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- AddPumpMain.Invoke(null, null);
+ AddAssetsPumpMain.Invoke(null, null);
}
#endregion 鍨嬪彿鑿滃崟
--
Gitblit v1.9.3