From 1bf6b7a300e21e9b8996f9ebeeb55a1eccda7a02 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 20 十二月 2024 10:50:36 +0800
Subject: [PATCH] 排除bug

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs
index 17d370e..c1d6403 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs
@@ -1,5 +1,6 @@
 锘縰sing DevExpress.XtraEditors;
 using Yw;
+using Yw.Untity;
 
 namespace HStation.WinFrmUI.Assets
 {
@@ -18,19 +19,19 @@
         //鑱氱劍鏀瑰彉浜嬩欢
         public event Action<long> ReloadEvent = null;
 
-        private BLL.PipeSeries _bll = null;
+        private BLL.AssetsPipeSeries _bll = null;
 
-        private List<PipeLineSeriesViewModel> _allBindingList = new List<PipeLineSeriesViewModel>();
+        private List<AssetsPipeSeriesViewModel> _allBindingList = new List<AssetsPipeSeriesViewModel>();
 
         public async void SetBindingData()
         {
-            _bll = new BLL.PipeSeries();
+            _bll = new BLL.AssetsPipeSeries();
             var alllist = await _bll.GetAll();
             if (alllist != null)
             {
                 foreach (var item in alllist)
                 {
-                    _allBindingList.Add(new PipeLineSeriesViewModel(item));
+                    _allBindingList.Add(new AssetsPipeSeriesViewModel(item));
                 }
             }
             this.treeList1.DataSource = _allBindingList;
@@ -38,7 +39,7 @@
         }
 
         //鑾峰彇绯诲垪ID
-        public PipeLineSeriesViewModel GetCurrentSeries()
+        public AssetsPipeSeriesViewModel GetCurrentSeries()
         {
             var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
             if (vm == null)
@@ -50,14 +51,19 @@
         private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             var dlg = new AddPipeLineSeriesDlg();
-            dlg.ReloadDataEvent += async (rhs) =>
+            dlg.ReloadDataEvent += async (rhs, currentId) =>
             {
-                var bll = new BLL.PipeSeries();
+                if (currentId != null)
+                {
+                    var select = await _bll.GetByID(Convert.ToInt64(currentId));
+                    rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
+                }
+                var bll = new BLL.AssetsPipeSeries();
                 var id = await bll.Insert(rhs);
                 if (id > 0)
                 {
                     rhs.ID = id;
-                    _allBindingList.Add(new PipeLineSeriesViewModel(rhs));
+                    _allBindingList.Add(new AssetsPipeSeriesViewModel(rhs));
                     this.treeList1.RefreshDataSource();
                     return true;
                 }
@@ -72,7 +78,6 @@
             var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
             if (vm == null)
             {
-                MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
                 return;
             }
             ReloadEvent.Invoke(vm.ID);
@@ -88,13 +93,18 @@
                 return;
             }
             var dlg = new EditPipeLineSeriesDlg();
-            var PipeLineSeries = await BLLFactory<BLL.PipeSeries>.Instance.GetByID(vm.ID);
+            var PipeLineSeries = await BLLFactory<BLL.AssetsPipeSeries>.Instance.GetByID(vm.ID);
             if (PipeLineSeries == null)
                 return;
             dlg.SetBindingData(PipeLineSeries);
-            dlg.ReloadDataEvent += async (rhs) =>
+            dlg.ReloadDataEvent += async (rhs, currentId) =>
             {
-                if (await BLLFactory<BLL.PipeSeries>.Instance.Update(rhs))
+                if (currentId != null)
+                {
+                    var select = await _bll.GetByID(Convert.ToInt64(currentId));
+                    rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
+                }
+                if (await BLLFactory<BLL.AssetsPipeSeries>.Instance.Update(rhs))
                 {
                     vm.Reset(rhs);
                     this.treeList1.RefreshDataSource();

--
Gitblit v1.9.3