diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index e5cfab25..918dca8b 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -117,11 +117,21 @@ namespace WMS.Web.Api.Controllers /// /// [HttpGet] - [Route("GetOrg")] - public async Task> GetOrg() + [Route("GetOrg/{name}")] + public async Task> GetOrg([FromRoute] string name) { var orgs_result = await _erpService.BillQueryForOrg(); - return orgs_result; + List pullList = new List(); + foreach (var c in orgs_result.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%"))) + { + pullList.Add(new PullDownStrResponse() + { + Id = c.Id.ToString(), + Name = c.Name, + Code = c.Number + }); + } + return ResultList.ReSuccess(pullList); } /// @@ -129,11 +139,22 @@ namespace WMS.Web.Api.Controllers /// /// [HttpGet] - [Route("GetSupplier")] - public async Task> GetSupplier() + [Route("GetSupplier/{name}")] + public async Task> GetSupplier([FromRoute] string name) { var supplier_result = await _erpService.BillQueryForSupplier(); - return supplier_result; + List pullList = new List(); + foreach (var c in supplier_result.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%"))) + { + pullList.Add(new PullDownStrResponse() + { + Id = c.Id.ToString(), + Name = c.Name, + Code = c.Number + }); + } + + return ResultList.ReSuccess(pullList); } /// @@ -198,7 +219,7 @@ namespace WMS.Web.Api.Controllers var customers = await _erpService.BillQueryForCustomer(); var orgs = await _erpService.BillQueryForOrg(); List pullList = new List(); - foreach (var c in customers.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%"))) + foreach (var c in customers.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%"))) { pullList.Add(new PullDownStrResponse() { diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 218ed7ce..d79ccbfb 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -332,13 +332,13 @@ 仓库模糊匹配 不必填 - + 获取组织-erp基础数据 - + 获取供应商-erp基础数据