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

cdk

2025-09-08 33583f8a9716e4313163fb9bbde58fea02012a28

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs

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