diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 141962fc..138b493f 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 e9b177f1..472da580 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -209,7 +209,7 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo); + var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo,dto.StockCode); int total = res.Count(); res = res.OrderByDescending(o => o).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList(); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 0b7689f7..7a0542df 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4954,6 +4954,11 @@ 单号 + + + 仓库编码 + + 出库任务单对应出库明细 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs index a07ca2b3..aca793e9 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs @@ -13,5 +13,9 @@ namespace WMS.Web.Core.Dto.OutStockTask /// 单号 /// public string BillNo { get; set; } + /// + /// 仓库编码 + /// + public string StockCode { get; set; } } } diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs index 5663c7a0..15a1ee6e 100644 --- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs @@ -47,7 +47,7 @@ namespace WMS.Web.Domain.Infrastructure //根据订单号获取订单信息 Task> GetOutStockTaskListByNo(string billNo); //模糊搜索订单号 - Task> GetOutStockTaskNosByNo(string billNo); + Task> GetOutStockTaskNosByNo(string billNo, string stockCode); //根据订单号获取订单信息 Task GetOutStockTaskByNo(string billNo); } diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 89c3707e..d0852250 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -520,18 +520,18 @@ namespace WMS.Web.Repositories } } - public async Task> GetOutStockTaskNosByNo(string billNo) + public async Task> GetOutStockTaskNosByNo(string billNo, string stockCode) { var res = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails) .Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") && - (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(stockCode)) .OrderByDescending(o => o.Id) .Select(s => s.BillNo) .ToListAsync(); var ress = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails) .Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) && - (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) + (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(stockCode)) .OrderByDescending(o => o.Id) .Select(s => s.BillNo) .ToListAsync();