Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
@@ -106,7 +106,10 @@ namespace WMS.Web.Repositories
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
if (materials != null)
|
||||
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
|
||||
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||
).Select(s => s.MaterialId).ToList();
|
||||
}
|
||||
|
||||
//取组织
|
||||
|
||||
@@ -231,7 +231,10 @@ namespace WMS.Web.Repositories
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
if (materials != null)
|
||||
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
|
||||
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||
).Select(s => s.MaterialId).ToList();
|
||||
}
|
||||
|
||||
//取组织
|
||||
|
||||
@@ -205,7 +205,10 @@ namespace WMS.Web.Repositories
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
{
|
||||
if (materials != null)
|
||||
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
|
||||
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||
).Select(s => s.MaterialId).ToList();
|
||||
}
|
||||
//金蝶子仓库
|
||||
var subStock_result = await _erpService.BillQueryForSubStock();
|
||||
|
||||
Reference in New Issue
Block a user