From dfd02ad42c5b4f8ee7190fe51730c21cf75d37a5 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期一, 24 十一月 2025 15:36:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs
index 0289baf..7aa4880 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs
@@ -1,4 +1,5 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.Utils;
+using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -25,6 +26,9 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
+ gridView1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+ gridView1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+ Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gridView1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
{
@@ -96,7 +100,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.RECEIVING_ORG 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
@@ -112,8 +120,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
--
Gitblit v1.9.3