This commit is contained in:
18942506660
2023-11-14 09:22:56 +08:00
parent 79374270ef
commit de69d0b179

View File

@@ -320,7 +320,9 @@ namespace WMS.Web.Repositories
var list = await _context.OutStockTask.Include(x => x.Details) var list = await _context.OutStockTask.Include(x => x.Details)
.Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync(); (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.ToListAsync();
var response = _mapper.Map<List<GetOutStockTaskByNoResponse>>(list); var response = _mapper.Map<List<GetOutStockTaskByNoResponse>>(list);
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套
foreach (var r in response.SelectMany(s => s.details)) foreach (var r in response.SelectMany(s => s.details))
@@ -371,6 +373,7 @@ namespace WMS.Web.Repositories
var entitys = await _context.OutStockTask var entitys = await _context.OutStockTask
.Include(s => s.Details) .Include(s => s.Details)
.Where(w => billNos.Contains(w.BillNo)) .Where(w => billNos.Contains(w.BillNo))
.OrderByDescending(o => o.Id)
.ToListAsync(); .ToListAsync();
return entitys.Clone(); return entitys.Clone();
@@ -418,6 +421,7 @@ namespace WMS.Web.Repositories
.Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") || .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) && EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) &&
(f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)) (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
.OrderByDescending(o => o.Id)
.Select(s => s.BillNo) .Select(s => s.BillNo)
.ToListAsync(); .ToListAsync();
} }