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

17
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -31,6 +31,7 @@ namespace WMS.Web.Repositories
private readonly IServiceProvider _serviceProvider;
private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService;
private readonly IBasicsRepositories _basicsRepositories;
private readonly ILoginRepositories _loginRepositories;
private readonly IErpService _erpService;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
@@ -39,6 +40,7 @@ namespace WMS.Web.Repositories
public InStockTaskRepositories(RepositoryDbContext context,
IMapper mapper,
IErpService erpService,
IBasicsRepositories basicsRepositories,
IServiceProvider serviceProvider,
ISingleDataService singleDataService,
ILoginRepositories loginRepositories,
@@ -47,6 +49,7 @@ namespace WMS.Web.Repositories
_context = context;
_mapper = mapper;
_erpService = erpService;
_basicsRepositories = basicsRepositories;
_serviceProvider = serviceProvider;
_singleDataService = singleDataService;
_loginRepositories = loginRepositories;
@@ -77,6 +80,15 @@ namespace WMS.Web.Repositories
return (new List<InStockTaskQueryResponse>(), 0);
var suppliers = suppliers_result.Data.ToList();
List<int> ids_Receiver = new List<int>();
List<int> ids_Operator = new List<int>();
if (!string.IsNullOrEmpty(dto.Receiver) || !string.IsNullOrEmpty(dto.Operator))
{
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
ids_Receiver = staffList.Where(w => w.Name.Contains(dto.Receiver)).Select(s => s.Id).ToList();
ids_Operator = staffList.Where(w => w.Name.Contains(dto.Operator)).Select(s => s.Id).ToList();
}
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
@@ -96,6 +108,10 @@ namespace WMS.Web.Repositories
query = query.Where(w => mids.Contains(w.detail.MaterialId));
}
if (ids_Receiver.Count() > 0)
query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId??0));
if (ids_Operator.Count() > 0)
query = query.Where(w => ids_Operator.Contains(w.order.ShelferId??0));
if (dto.SupplierId.HasValue)
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
@@ -142,6 +158,7 @@ namespace WMS.Web.Repositories
Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "",
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
Remark=s.detail.Remark,
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);