Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

ch

2022-05-07 64eee12be4c7d513ac170bf13889b3de50be7f2b

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -41,13 +41,14 @@
                string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_WareHouseList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 仓库代码 ", "h_v_IF_WareHouseList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by 仓库代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
                }

                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
                //    objJsonResult.code = "0";