接口优化
This commit is contained in:
@@ -94,10 +94,15 @@ namespace WMS.Web.Repositories
|
||||
query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
|
||||
|
||||
//物料ID在模糊后的物料
|
||||
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
var mids = materials.Select(x => x.MaterialId).ToList();
|
||||
query = query.Where(w => mids.Contains(w.detail.MaterialId));
|
||||
if (materials != null && materials.Count != 0)
|
||||
{
|
||||
var mids = materials.Select(x => x.MaterialId).ToList();
|
||||
query = query.Where(w => mids.Contains(w.detail.MaterialId));
|
||||
}
|
||||
else
|
||||
query = query.Where(w => w.detail.MaterialId == 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -116,6 +121,7 @@ namespace WMS.Web.Repositories
|
||||
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
|
||||
Qty = s.detail.Qty,
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
return (list,total);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user