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

cdk

5 天以前 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs

@@ -229,7 +229,7 @@
        {
            gcMain1.DataSource = null; 
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and daa.erp_sczz in");
            _sbSqlWhere.Append(" and bm.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());