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

优化列表查询

Browse Source
This commit is contained in:
tongfei
2024-03-06 14:21:31 +08:00
parent 02acd059dd
commit 1ccb5c7ecd
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Repositories/BoxMarkRepositories.cs
View File

@@ -124,10 +124,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.order.MaterialId == 0);
}
if (cr_ids.Count != 0)
if(!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => cr_ids.Contains(w.order.CreatorId));
else if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => w.order.CreatorId==0);
if (dto.BeginDate != null)
query = query.Where(w => w.order.CreateTime.Date >= dto.BeginDate.Value);
if (dto.EndDate != null)

4
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -321,10 +321,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.detail.MaterialId == 0);
}
if (cr_ids.Count!=0)
if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => cr_ids.Contains(w.order.CreatorId));
else if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => w.order.CreatorId == 0);
if (dto.SupplierId.HasValue)
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);

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

@@ -456,12 +456,14 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.Receiver))
{
var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
if (staffList != null && staffList.Count!=0)
ids_Receiver = staffList.Where(w => w.Name.Contains(dto.Receiver)).Select(s => s.Id).ToList();
}
if (!string.IsNullOrEmpty(dto.Operator))
{
var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
if (staffList != null && staffList.Count != 0)
ids_Operator = staffList.Where(w => w.Name.Contains(dto.Operator)).Select(s => s.Id).ToList();
}
@@ -495,15 +497,11 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.detail.MaterialId == 0);
}
if (ids_Receiver.Count() > 0)
if (!string.IsNullOrEmpty(dto.Receiver))
query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId ?? 0));
else if (!string.IsNullOrEmpty(dto.Receiver))
query = query.Where(w => w.order.ReceiverId == 0);
if (ids_Operator.Count() > 0)
if (!string.IsNullOrEmpty(dto.Operator))
query = query.Where(w => ids_Operator.Contains(w.order.ShelferId ?? 0));
else if (!string.IsNullOrEmpty(dto.Operator))
query = query.Where(w => w.order.ShelferId == 0);
if (dto.SupplierId.HasValue)
query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);