From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.cs |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.cs
index 158e7a4..c613282 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI.Assets
+锘縰sing DevExpress.XtraEditors;
+
+namespace HStation.WinFrmUI.Assets
 {
     public partial class PumpProductListBox : DevExpress.XtraEditors.XtraUserControl
     {
@@ -11,11 +13,15 @@
 
         public List<CurrentPartMainViewModel> _allBindingList = null;
 
+        public BLL.AssetsPumpPartMain _Bll;
+
+        public event Action<object, MouseEventArgs> MouseUp;
+
         public async void SetBindingData(Vmo.AssetsPumpMainVmo AssetsPumpMain)
         {
             _allBindingList = new List<CurrentPartMainViewModel>();
-            var _bll = new BLL.AssetsPumpPartMain();
-            var allpartlist = await _bll.GetByPumpMainID(AssetsPumpMain.ID);   //鑾峰彇鎵�鏈変骇鍝�
+            _Bll = new BLL.AssetsPumpPartMain();
+            var allpartlist = await _Bll.GetByPumpMainID(AssetsPumpMain.ID);   //鑾峰彇鎵�鏈変骇鍝�
             var series = await new BLL.AssetsPumpSeries().GetByID(AssetsPumpMain.PumpSeriesID);  //鑾峰彇绯诲垪
             if (allpartlist != null)
             {
@@ -47,5 +53,33 @@
         {
             SelectReloadEvent.Invoke();
         }
+
+        private void listBoxControl1_MouseUp(object sender, MouseEventArgs e)
+        {
+            MouseUp.Invoke(sender, e);
+        }
+
+        //鍒犻櫎灞炴��
+        private async void barBtnDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var vm = this.listBoxControl1.GetCurrentViewModel(_allBindingList);
+            if (vm == null)
+            {
+                TipFormHelper.ShowWarn("璇烽�夋嫨鏁版嵁琛�!");
+                return;
+            }
+            if (MessageBoxHelper.IsClickOk($"纭鍒犻櫎鏁版嵁琛�?", "鎻愮ず"))
+                return;
+            if (await _Bll.DeleteEx(vm.ID))
+            {
+                _allBindingList.Remove(vm);
+                this.listBoxControl1.Refresh();
+                TipFormHelper.ShowSucceed("鍒犻櫎鎴愬姛!");
+            }
+            else
+            {
+                TipFormHelper.ShowError("鍒犻櫎澶辫触!");
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3