From cc286e3641ef72fe7cb1312487a6d4e40bda81fe Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
index 044a7df..3487237 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
@@ -25,16 +25,15 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
-
// 璁剧疆gridView1鍙傛暟锛屽苟娣诲姞琛岄�夋嫨浜嬩欢澶勭悊
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", null);
-
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", null, tips, true, (mxxGuid) =>
+ {
+ /// MessageBox.Show(mxxGuid.ToString());
+ });
// 娣诲姞gridView1鐨勮閫夋嫨鍙樺寲浜嬩欢
gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
-
// 璁剧疆gridView2鍙傛暟
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
-
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
}, (value) =>
@@ -86,7 +85,6 @@
{
daa001 = workOrderNo
};
-
string json = JsonConvert.SerializeObject(requestObj);
// 璋冪敤鍚庡彴鎺ュ彛鑾峰彇鏄庣粏鏁版嵁
@@ -196,7 +194,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3