diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 20a1dcff..e6f4198a 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -87,7 +87,7 @@ namespace WMS.Web.Api.Controllers } /// - /// 根据出库单任务编号模糊搜索-PDA出库 + /// 根据出库单任务编号模糊搜索 /// /// /// @@ -104,6 +104,24 @@ namespace WMS.Web.Api.Controllers return ResultList.ReSuccess(res); } + /// + /// 根据出库单任务编号模糊搜索下拉-PDA出库 + /// + /// + /// + [HttpGet] + [Route("GetOutStockTaskNosByNo/{billNo}")] + public async Task> GetOutStockTaskNosByNo([FromRoute] string billNo) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + + var res = await _repositories.GetOutStockTaskNosByNo(billNo); + if (res == null || res.Count() == 0) return ResultList.ReFailure(ResultCodes.OutStockTaskNoData); + return ResultList.ReSuccess(res); + } + /// /// 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库 /// diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index d79ccbfb..555fc28c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -295,7 +295,14 @@ - 根据出库单任务编号模糊搜索-PDA出库 + 根据出库单任务编号模糊搜索 + + + + + + + 根据出库单任务编号模糊搜索下拉-PDA出库 diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs index 4365fed1..5bf69f66 100644 --- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs @@ -38,6 +38,8 @@ namespace WMS.Web.Domain.Infrastructure Task Get(int id); //根据订单号获取订单信息 Task> GetOutStockTaskListByNo(string billNo); + //模糊搜索订单号 + Task> GetOutStockTaskNosByNo(string billNo); //根据订单号获取订单信息 Task GetOutStockTaskByNo(string billNo); } diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 8c36edcb..177976bd 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -411,5 +411,15 @@ namespace WMS.Web.Repositories return false; } } + + public async Task> GetOutStockTaskNosByNo(string billNo) + { + return await _context.OutStockTask.Include(x => x.Details) + .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || + EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + .Select(s => s.BillNo) + .ToListAsync(); + } } }