优化物料查询
This commit is contained in:
@@ -66,7 +66,13 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
//物料集合;模糊查询后的物料集合
|
//物料集合;模糊查询后的物料集合
|
||||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
{
|
||||||
|
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||||
|
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||||
|
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||||
|
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||||
|
).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
//组织集合
|
//组织集合
|
||||||
var orgs = new List<ErpOrgDto>();
|
var orgs = new List<ErpOrgDto>();
|
||||||
|
|||||||
@@ -283,7 +283,13 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
//物料集合;模糊查询后的物料集合
|
//物料集合;模糊查询后的物料集合
|
||||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
{
|
||||||
|
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||||
|
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||||
|
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||||
|
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||||
|
).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
if (companyId == 0)
|
if (companyId == 0)
|
||||||
companyId = _loginRepositories.CompanyId;
|
companyId = _loginRepositories.CompanyId;
|
||||||
|
|||||||
@@ -459,7 +459,13 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
//物料集合;模糊查询后的物料集合
|
//物料集合;模糊查询后的物料集合
|
||||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
{
|
||||||
|
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||||
|
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||||
|
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||||
|
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||||
|
).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
var query = _context.InStockTaskDetails
|
var query = _context.InStockTaskDetails
|
||||||
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
||||||
|
|||||||
@@ -64,7 +64,13 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
//物料集合;模糊查询后的物料集合
|
//物料集合;模糊查询后的物料集合
|
||||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||||
materials = materials.Where(w =>w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
{
|
||||||
|
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||||
|
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||||
|
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||||
|
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||||
|
).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
//组织集合
|
//组织集合
|
||||||
var orgs = new List<ErpOrgDto>();
|
var orgs = new List<ErpOrgDto>();
|
||||||
|
|||||||
@@ -71,7 +71,13 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
//物料集合;模糊查询后的物料集合
|
//物料集合;模糊查询后的物料集合
|
||||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||||
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
{
|
||||||
|
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
|
||||||
|
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|
||||||
|
|| w.MaterialName.Contains(dto.MaterialNumber)
|
||||||
|
|| w.Specifications.Contains(dto.MaterialNumber)
|
||||||
|
).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
var query = _context.InventoryInOutDetails
|
var query = _context.InventoryInOutDetails
|
||||||
.Where(adv => 1 == 1);
|
.Where(adv => 1 == 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user