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

列表优化

Browse Source
This commit is contained in:
tongfei
2023-11-25 10:30:05 +08:00
parent 1f0f21bd12
commit 96fd74953f
4 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/WMS.Web.Repositories/BackRecordRepositories.cs
View File

@@ -26,6 +26,7 @@ namespace WMS.Web.Repositories
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
private readonly ILoginRepositories _loginRepositories;
private readonly IBasicsRepositories _basicsRepositories;
private readonly RepositoryDbContext _context;
private readonly IErpService _erpService;
private readonly ISingleDataService _singleDataService;
@@ -35,6 +36,7 @@ namespace WMS.Web.Repositories
public BackRecordRepositories(RepositoryDbContext context,
IMapper mapper,
IErpService erpService,
IBasicsRepositories basicsRepositories,
ILoginRepositories loginRepositories,
IServiceProvider serviceProvider,
ISingleDataService singleDataService,
@@ -43,6 +45,7 @@ namespace WMS.Web.Repositories
_erpService = erpService;
_context = context;
_mapper = mapper;
_basicsRepositories = basicsRepositories;
_serviceProvider = serviceProvider;
_loginRepositories = loginRepositories;
_singleDataService = singleDataService;
@@ -68,6 +71,13 @@ namespace WMS.Web.Repositories
return (new List<BackRecordQueryResponse>(), 0);
var orgs = orgs_result.Data.ToList();
List<int> ids = new List<int>();
if (!string.IsNullOrEmpty(dto.Creator))
{
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
ids = staffList.Where(w =>w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
}
var query = _context.BackRecordDetails
.GroupJoin(_context.BackRecord, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
@@ -77,7 +87,13 @@ namespace WMS.Web.Repositories
if (dto.SubStockId.HasValue)
query = query.Where(w => w.detail.SubStockId == dto.SubStockId.Value);
if(dto.Type.HasValue)
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
if (ids.Count() > 0)
query = query.Where(w => ids.Contains(w.order.CreatorId));
if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
if (dto.CreateEndDate != null)