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

zzr99

2021-10-22 17ea6bba570df1f10bf203c7577054d6d7b43a2a

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -25,18 +25,18 @@
        /// </summary>
        [Route("Gy_Warehouse/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string Organization)
        {
            try
            {
                string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_WareHouseList " + sWhere, "h_v_IF_WareHouseList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_WareHouseList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_WareHouseList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)