18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整出库单号搜索

Browse Source
This commit is contained in:
18942506660
2023-11-09 14:58:03 +08:00
parent b396c980b0
commit 457d291f4a
5 changed files with 28 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -308,12 +308,25 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="billNo"></param>
/// <returns></returns>
public async Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo)
public async Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo(string billNo)
{
var entity = await _context.OutStockTask.Include(x => x.Details).FirstOrDefaultAsync(f => billNo.Equals(f.BillNo));
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return new List<GetOutStockTaskByNoResponse>();
var materials = materials_result.Data.ToList();
var list = 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)).ToListAsync();
var response = _mapper.Map<List<GetOutStockTaskByNoResponse>>(list);
//获取物料信息 显示物料三件套
var mIds = entity.Details.Select(s => s.MaterialId).ToList();
foreach (var r in response.SelectMany(s => s.details))
{
r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialId);
r.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, r.MaterialId);
r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialId);
}
return response;
}
/// <summary>