diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index ea665c6a..54996575 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -121,10 +122,11 @@ namespace WMS.Web.Api.Controllers /// 根据仓库获取金蝶子仓库 /// /// 仓库id + /// 模糊匹配 /// [HttpGet] [Route("GetErp_SubUcStock/{id}")] - public async Task>> GetErp_SubUcStock([FromRoute] int id) + public async Task>> GetErp_SubUcStock([FromRoute] int id, [FromQuery] string name) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) @@ -135,7 +137,7 @@ namespace WMS.Web.Api.Controllers if (code.Substring(0, 2).Equals("HD") || code.Substring(0, 2).Equals("GD")) { var subs = await _erpService.BillQueryForSubStock(code); - foreach (var s in subs.Data) + foreach (var s in subs.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%"))) { list.Add(new UcStockResponse() {