Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

2025-09-05 550cb6847bf4c8586bd5430b10ac9d25e8469f5a

Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

 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;
    }
}

 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