From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/01-series/SprinklerTreeListCtrl.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/01-series/NozzleTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/01-series/SprinklerTreeListCtrl.cs
similarity index 77%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/01-series/NozzleTreeListCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/01-series/SprinklerTreeListCtrl.cs
index 4ef92d2..47f6ad6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/01-series/NozzleTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/01-series/SprinklerTreeListCtrl.cs
@@ -6,9 +6,9 @@
/// <summary>
///
/// </summary>
- public partial class NozzleTreeListCtrl : XtraUserControl
+ public partial class SprinklerTreeListCtrl : XtraUserControl
{
- public NozzleTreeListCtrl()
+ public SprinklerTreeListCtrl()
{
InitializeComponent();
this.treeList1.InitialDefaultSettings();
@@ -18,19 +18,19 @@
//鑱氱劍鏀瑰彉浜嬩欢
public event Action<long> ReloadEvent = null;
- private BLL.AssetsNozzleSeries _bll = null;
+ private BLL.AssetsSprinklerSeries _bll = null;
- private List<AssetsNozzleSeriesViewModel> _allBindingList = new List<AssetsNozzleSeriesViewModel>();
+ private List<AssetsSprinklerSeriesViewModel> _allBindingList = new List<AssetsSprinklerSeriesViewModel>();
public async void SetBindingData()
{
- _bll = new BLL.AssetsNozzleSeries();
+ _bll = new BLL.AssetsSprinklerSeries();
var alllist = await _bll.GetAll();
if (alllist != null)
{
foreach (var item in alllist)
{
- _allBindingList.Add(new AssetsNozzleSeriesViewModel(item));
+ _allBindingList.Add(new AssetsSprinklerSeriesViewModel(item));
}
}
this.treeList1.DataSource = _allBindingList;
@@ -38,7 +38,7 @@
}
//鑾峰彇绯诲垪ID
- public AssetsNozzleSeriesViewModel GetCurrentSeries()
+ public AssetsSprinklerSeriesViewModel GetCurrentSeries()
{
var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (vm == null)
@@ -49,15 +49,15 @@
//娣诲姞闃�闂ㄧ郴鍒�
private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AddAssetsNozzleSeriesDlg();
+ var dlg = new AddAssetsSprinklerSeriesDlg();
dlg.ReloadDataEvent += async (rhs) =>
{
- var bll = new BLL.AssetsNozzleSeries();
+ var bll = new BLL.AssetsSprinklerSeries();
var id = await bll.Insert(rhs);
if (id > 0)
{
rhs.ID = id;
- _allBindingList.Add(new AssetsNozzleSeriesViewModel(rhs));
+ _allBindingList.Add(new AssetsSprinklerSeriesViewModel(rhs));
this.treeList1.RefreshDataSource();
return true;
}
@@ -87,14 +87,14 @@
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
return;
}
- var dlg = new EditAssetsNozzleSeriesDlg();
- var AssetsNozzleSeries = await BLLFactory<BLL.AssetsNozzleSeries>.Instance.GetByID(vm.ID);
- if (AssetsNozzleSeries == null)
+ var dlg = new EditAssetsSprinklerSeriesDlg();
+ var AssetsSprinklerSeries = await BLLFactory<BLL.AssetsSprinklerSeries>.Instance.GetByID(vm.ID);
+ if (AssetsSprinklerSeries == null)
return;
- dlg.SetBindingData(AssetsNozzleSeries);
+ dlg.SetBindingData(AssetsSprinklerSeries);
dlg.ReloadDataEvent += async (rhs) =>
{
- if (await BLLFactory<BLL.AssetsNozzleSeries>.Instance.Update(rhs))
+ if (await BLLFactory<BLL.AssetsSprinklerSeries>.Instance.Update(rhs))
{
vm.Reset(rhs);
this.treeList1.RefreshDataSource();
--
Gitblit v1.9.3