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

zzr99

2022-08-22 7d860d3718eaf73e26fefa91dbe4bea58ca30183

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -48,22 +48,13 @@
                    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";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "false！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                //}


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {