diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index 7fce9de3..67d4251c 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -66,7 +66,13 @@ namespace WMS.Web.Repositories //物料集合;模糊查询后的物料集合 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(); diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index afc8c4de..db2b020c 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -283,7 +283,13 @@ namespace WMS.Web.Repositories //物料集合;模糊查询后的物料集合 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) companyId = _loginRepositories.CompanyId; diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 586b9a6d..a8d14e7e 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -459,7 +459,13 @@ namespace WMS.Web.Repositories //物料集合;模糊查询后的物料集合 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 .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs index 37c74100..502627a9 100644 --- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs @@ -64,7 +64,13 @@ namespace WMS.Web.Repositories //物料集合;模糊查询后的物料集合 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(); diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs index 91fee443..5a2e9a94 100644 --- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs @@ -71,7 +71,13 @@ namespace WMS.Web.Repositories //物料集合;模糊查询后的物料集合 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 .Where(adv => 1 == 1);