From 2fb710372202d0ef4e64a308892169551d3b5110 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 12 十一月 2025 09:52:10 +0800
Subject: [PATCH] 合并领料

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   82 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 1daefa8..b9f493e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1725,25 +1725,26 @@
         /// <param name="action2">濮旀墭2</param>
         public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true, DelegateGetModel action2 = null)
         {
-            gridView1.PopupMenuShowing += (s, e) =>
-            {
-                if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
-                {
-                    GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
-                    if (menu != null)
-                    {
-                        string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
-                        for (int i = menu.Items.Count - 1; i >= 0; i--)
-                        {
-                            string _caption = menu.Items[i].Caption;
-                            if (!ary.Contains(_caption))
-                            {
-                                menu.Items.Remove(menu.Items[i]);
-                            }
-                        }
-                    }
-                }
-            };
+            //2025-11-06 cnf 寮曞叆涓枃鎻掍欢娉�
+            /* gridView1.PopupMenuShowing += (s, e) =>
+             {
+                 if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
+                 {
+                     GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
+                     if (menu != null)
+                     {
+                         string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
+                         for (int i = menu.Items.Count - 1; i >= 0; i--)
+                         {
+                             string _caption = menu.Items[i].Caption;
+                             if (!ary.Contains(_caption))
+                             {
+                                 menu.Items.Remove(menu.Items[i]);
+                             }
+                         }
+                     }
+                 }
+             };*/
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
             if (isPostSearch == true)
             {
@@ -2008,27 +2009,28 @@
         /// <param name="icoName"></param>
         public static void SetGridViewParameterMx(GridView gridView1, DevExpress.Utils.ToolTipController tips = null)
         {
-            gridView1.PopupMenuShowing += (s, e) =>
-            {
-                if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
-                {
-                    GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
-                    if (menu != null)
-                    {
-                        string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
-                        for (int i = menu.Items.Count - 1; i >= 0; i--)
-                        {
-                            string _caption = menu.Items[i].Caption;
-                            if (!ary.Contains(_caption))
-                            {
-                                menu.Items.Remove(menu.Items[i]);
-                            }
-                        }
-                    }
-                }
-            };
-            gridView1.OptionsView.ShowGroupPanel = false;
-            gridView1.OptionsCustomization.AllowGroup = false;
+            //2025-11-06 cnf 娉�
+            /* gridView1.PopupMenuShowing += (s, e) =>
+             {
+                 if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
+                 {
+                     GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
+                     if (menu != null)
+                     {
+                         string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
+                         for (int i = menu.Items.Count - 1; i >= 0; i--)
+                         {
+                             string _caption = menu.Items[i].Caption;
+                             if (!ary.Contains(_caption))
+                             {
+                                 menu.Items.Remove(menu.Items[i]);
+                             }
+                         }
+                     }
+                 }
+             };
+             gridView1.OptionsView.ShowGroupPanel = false;
+             gridView1.OptionsCustomization.AllowGroup = false;*/
 
             // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
             foreach (GridColumn column in gridView1.Columns)

--
Gitblit v1.9.3