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-04-01 15:18:51 +08:00
parent ce1a2ad543
commit 5d20813a8a
6 changed files with 117 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,10 +57,11 @@ namespace WMS.Web.Repositories
if (materials_result.IsSuccess)
materials = materials_result.Data.ToList();
List<string> materialNumbs = new List<string>();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.Material))
materials = materials.Where(w => w.MaterialNumber.Contains(dto.Material) || w.MaterialName.Contains(dto.Material) || w.Specifications.Contains(dto.Material)).ToList();
materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.Material) || w.MaterialName.Contains(dto.Material) || w.Specifications.Contains(dto.Material)).Select(x => x.MaterialNumber).ToList();
if (companyId == 0)
companyId = _loginRepositories.CompanyId;
@@ -110,17 +111,10 @@ namespace WMS.Web.Repositories
}
}
List<string> mNumber = new List<string>();
//物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.Material))
{
if (materials != null)
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.Material)
|| w.MaterialName.Contains(dto.Material)
|| w.Specifications.Contains(dto.Material)
).Select(s => s.MaterialNumber).ToList();
query = query.Where(w => mNumber.Contains(w.order.MaterialNumber));
query = query.Where(w => materialNumbs.Contains(w.order.MaterialNumber));
}
if (!string.IsNullOrEmpty(dto.Creator))