From cf758a0cd625345be2176bd19ac0d94c8fe609d6 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 06 八月 2025 18:52:25 +0800
Subject: [PATCH] 1、采购到货新增合并提交 2、顶部按钮合并按钮启用
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0bac2a1..44f212d 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2294,6 +2294,13 @@
}
}
+ /// <summary>
+ /// gridview 鍏ㄩ�夛紝鍙栨秷鍏ㄩ��
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <param name="gcMain"></param>
+ /// <param name="gridView1"></param>
public static void CustomMouseUp(object sender, MouseEventArgs e, DevExpress.XtraGrid.GridControl gcMain, DevExpress.XtraGrid.Views.Grid.GridView gridView1)
{
GridColumn checkBoxColumn = gridView1.Columns[0];
@@ -2314,10 +2321,27 @@
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;
@@ -2332,30 +2356,30 @@
#endregion
- //璇诲彇榛樿缁勭粐
- public static string GetFirstOrg(UserControl.UcLookOrg txt_erpSczz)
- {
- string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
- var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- var _obj = UtilityHelper.ReturnToDynamic(strReturn);
- string _extendText = _obj.rtnData.extendText;
- string[] _dftOrg = _extendText.Split(',');
- if (_dftOrg.Length > 0)
- {
- txt_erpSczz.SetIdOrCode(_dftOrg[0].Trim());
- return _dftOrg[0].Trim();
- }
- return "";
- }
- catch (Exception ex)
- {
- return "";
- }
- }
+ //璇诲彇榛樿缁勭粐
+ public static string GetFirstOrg(UserControl.UcLookOrg txt_erpSczz)
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ string _extendText = _obj.rtnData.extendText;
+ string[] _dftOrg = _extendText.Split(',');
+ if (_dftOrg.Length > 0)
+ {
+ txt_erpSczz.SetIdOrCode(_dftOrg[0].Trim());
+ return _dftOrg[0].Trim();
+ }
+ return "";
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
}
/// <summary>
--
Gitblit v1.9.3