From 550cb6847bf4c8586bd5430b10ac9d25e8469f5a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs | 17 +++++++++++++++--
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs | 6 +++++-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
index 483bb3d..ca3a170 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
@@ -45,6 +45,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -144,7 +145,8 @@
this.gridColumn3,
this.gridColumn4,
this.gridColumn5,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn7});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -156,7 +158,7 @@
//
// gridColumn1
//
- this.gridColumn1.Caption = "寮�宸ユ棩鏈�";
+ this.gridColumn1.Caption = "棰勮寮�宸ユ椂闂�";
this.gridColumn1.FieldName = "mesStartProd";
this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
@@ -264,6 +266,16 @@
this.gridColumn6.VisibleIndex = 9;
this.gridColumn6.Width = 112;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn7.FieldName = "orgName";
+ this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.Width = 112;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -318,5 +330,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
index 1df1b0d..7808abd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
@@ -89,7 +89,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 c.FSubsidiary 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