From 2023dd8503b28bda2314816008b0bada633c2f38 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 11 八月 2025 09:10:32 +0800
Subject: [PATCH] 其它入库

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   58 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 8749e37..c206f49 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -62,13 +62,17 @@
         /// <returns></returns>
         public static string HttpPost(string url, string meth, string param, bool isLoading = true)
         {
-            Size _size; string _caption; Color _color; Padding _pad;
-            (_size, _caption, _color, _pad) = getLoading();
-            DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:" + meth, _caption, _size);
-            wdf.BackColor = _color;
-            wdf.Padding = _pad;
-            wdf.SetCaption("鍔犺浇杩涘害:" + meth);
-            wdf.Visible = isLoading;
+            DevExpress.Utils.WaitDialogForm wdf = null;
+            if (isLoading == true)
+            {
+                Size _size; string _caption; Color _color; Padding _pad;
+                (_size, _caption, _color, _pad) = getLoading();
+                wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:" + meth, _caption, _size);
+                wdf.BackColor = _color;
+                wdf.Padding = _pad;
+                wdf.SetCaption("鍔犺浇杩涘害:" + meth);
+                wdf.Visible = isLoading;
+            }
             HttpWebRequest request = null;
             StreamWriter requestStream = null;
             WebResponse response = null;
@@ -103,7 +107,8 @@
             }
             catch (Exception ex)
             {
-                wdf.Close();
+                if (wdf != null)
+                    wdf.Close();
                 LogHelper.Debug(url, param + ":" + ex.Message);
                 throw ex;
             }
@@ -113,7 +118,8 @@
                 requestStream = null;
                 response = null;
             }
-            wdf.Close();
+            if (wdf != null)
+                wdf.Close();
             return responseStr;
         }
 
@@ -268,7 +274,8 @@
                         {
                             colmn.Visible = true;
                             colmn.OptionsColumn.ReadOnly = false;
-                        };
+                        }
+                        ;
                         if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
                         {
                             colmn.Visible = !isEdt;
@@ -458,7 +465,7 @@
                         {
                             var txt = colType as RadioGroup;
                             if (txt != null)
-                                txt.SelectedIndex =int.Parse( strVal);
+                                txt.SelectedIndex = int.Parse(strVal);
                             txt.ReadOnly = isEdt;
                             continue;
                         }
@@ -1933,7 +1940,8 @@
                 {
                     int _handle = gridView1.FocusedRowHandle;
                     bool _bl = xtraTabControl1.TabPages[0].PageEnabled;
-                    if (_bl == false) { return; };
+                    if (_bl == false) { return; }
+                    ;
                     if (_handle < 0)
                     {
                         xtraTabControl1.SelectedTabPageIndex = -1;
@@ -2196,8 +2204,6 @@
                 txt_iCount_1.ReadOnly = true;
         }
 
-
-
         #region 鑷畾涔夎繘搴︽潯鍒�
 
         /// <summary>
@@ -2292,7 +2298,6 @@
         // private GridColumn checkBoxColumn = null;
         public static void CustomDrawColumnHeader(object sender, ColumnHeaderCustomDrawEventArgs e)
         {
-
             Rectangle checkBoxColumnHeaderRect = new Rectangle(51, 1, 37, 57);
             if (e.Column != null && e.Column.AbsoluteIndex == 0)
             {
@@ -2336,10 +2341,26 @@
                     else
                     {
                         checkBoxColumn.Tag = "1";
+                        /********2025-07-23淇ˉ杩囨护bug 鏁呮敞閲� beg ************/
+                        //foreach (DataRow row in _Table.Rows)
+                        //{
+                        //    row["chkInt"] = true;
+                        //}
+                        /********2025-07-23淇ˉ杩囨护bug 鏁呮敞閲� end ************/
+                        /********2025-07-23淇ˉ杩囨护bug beg ************/
+                        System.Collections.IList ftRow = gridView1.DataController.GetAllFilteredAndSortedRows();
+                        System.Collections.ArrayList ftAry = new System.Collections.ArrayList();
+                        foreach (System.Data.DataRowView _ft in ftRow)
+                        {
+                            string guid = _ft["guid"].ToString();
+                            ftAry.Add(guid);
+                        }
                         foreach (DataRow row in _Table.Rows)
                         {
-                            row["chkInt"] = true;
+                            if (ftAry.Contains(row["guid"].ToString()))
+                                row["chkInt"] = true;
                         }
+                        /********2025-07-23淇ˉ杩囨护bug end ************/
                     }
                     gcMain.BindingContext = new BindingContext();
                     gcMain.DataSource = _Table;
@@ -2352,7 +2373,6 @@
             }
         }
         #endregion
-
 
         //璇诲彇榛樿缁勭粐
         public static string GetFirstOrg(UserControl.UcLookOrg txt_erpSczz)
@@ -2462,8 +2482,12 @@
         鍏跺畠鍏ュ簱妫�,
         閿�鍞��璐у叆搴撴,
         瓒呮湡妫�,
+        濮斿閫�鏂欏叆搴撴,
         cqcjyes,//閲嶆鏂规
         cqcjno,//閲嶆鏂规
+        浜х嚎绉伴噸,
+        iqc绉伴噸,
+        鍙楁墭鍏ュ簱
     }
 
 

--
Gitblit v1.9.3