diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 3bc9b7f2..77019e42 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index d24caf84..b22c2feb 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -143,19 +143,22 @@ namespace WMS.Web.Api.Controllers /// /// 根据出库单任务编号模糊搜索下拉-PDA出库 /// - /// + /// /// - [HttpGet] + [HttpPost] [Route("GetOutStockTaskNosByNo")] - public async Task> GetOutStockTaskNosByNo([FromQuery] string billNo) + public async Task> GetOutStockTaskNosByNo([FromBody] GetOutStockTaskNosByNoRequest dto) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) - return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + return ResultPagedList.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); + var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo); + int total = res.Count(); + res = res.OrderByDescending(o => o).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList(); + + if (res == null || res.Count() == 0) return ResultPagedList.ReFailure(ResultCodes.OutStockTaskNoData); + return ResultPagedList.ReSuccess(res, total); } /// diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index e6f164b1..55befc43 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -410,11 +410,11 @@ - + 根据出库单任务编号模糊搜索下拉-PDA出库 - + diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index d77eb51b..cb7768ed 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4182,6 +4182,16 @@ 已出库数量 + + + 模糊搜索出库任务单 + + + + + 单号 + + 出库单任务列表 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs new file mode 100644 index 00000000..a07ca2b3 --- /dev/null +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.OutStockTask +{ + /// + /// 模糊搜索出库任务单 + /// + public class GetOutStockTaskNosByNoRequest : PaginationBaseRequestDto + { + /// + /// 单号 + /// + public string BillNo { get; set; } + } +} diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 675bb9bf..fa9b1bb1 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -472,7 +472,7 @@ namespace WMS.Web.Repositories .Select(s => s.BillNo) .ToListAsync(); res.AddRange(ress); - return res; + return res.Distinct().ToList(); } ///