From b2b169fcad7072edd66b1faa28ae390fc44d49be Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 24 七月 2025 16:10:12 +0800
Subject: [PATCH] 水检代码正常

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 0062ab2..dc8dd2f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -57,6 +57,8 @@
             btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
             btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
             btnAll.ItemClick += BtnAll_ItemClick;
+            btnGongZi.ItemClick += BtnGongZi_ItemClick;
+            btnLianBan.ItemClick += BtnLianBan_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -64,8 +66,6 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
-
-      
 
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
@@ -111,7 +111,7 @@
             }
             return false;
         }
-       
+
         private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnCaiGouFchkClick != null)
@@ -146,7 +146,7 @@
             if (btnShouHouChkClick != null)
                 btnShouHouChkClick(this, e);
         }
-       
+
         private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
         {
             bool bl = _isCk(0);
@@ -230,9 +230,10 @@
                 strType = xlsInService.Split('&')[1];
                 strService = xlsInService.Split('&')[0];
             }
-            else {
-                 strType = "";
-                 strService = xlsInService;
+            else
+            {
+                strType = "";
+                strService = xlsInService;
             }
             //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
             string upGuid = Guid.NewGuid().ToString();
@@ -254,7 +255,7 @@
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             };
             frm.ShowDialog();
@@ -361,12 +362,25 @@
         {
             if (btnQueryClick != null) btnQueryClick(this, e);
         }
-      
+
         private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnAllClick != null)
                 btnAllClick(this, e);
         }
+
+        private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnLianBanClick != null)
+                btnLianBanClick(this, e);
+        }
+
+        private void BtnGongZi_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnGongZiClick != null)
+                btnGongZiClick(this, e);
+        }
+
 
         /// <summary>
         /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
@@ -405,6 +419,8 @@
                 lst.Add(btnCaiGouFchk.Name);
                 lst.Add(btnShouHouChk.Name);
                 lst.Add(btnShouHouFchk.Name);
+                lst.Add(btnGongZi.Name);
+                lst.Add(btnLianBan.Name);
                 _enabledBtn(lst);
                 this.currentAction = "esc";
                 if (btnEscClick != null) btnEscClick(this, e);
@@ -453,6 +469,8 @@
                     lst.Add(btnShouHouFchk.Name);
                     lst.Add(btnIn.Name);
                     lst.Add(btnOut.Name);
+                    lst.Add(btnGongZi.Name);
+                    lst.Add(btnLianBan.Name);
                     _enabledBtn(lst);
                 }
             }
@@ -966,6 +984,18 @@
         /// 鎵归噺璁剧疆
         /// </summary>
         public event EventHandler btnAllClick;
+
+        /// <summary>
+        /// 杩炵彮璁剧疆
+        /// </summary>
+        public event EventHandler btnLianBanClick;
+
+
+        /// <summary>
+        /// 璁＄畻宸ヨ祫
+        /// </summary>
+        public event EventHandler btnGongZiClick;
+
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3