diff --git a/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs b/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs index d9906d8..add3d34 100644 --- a/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs +++ b/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs @@ -7,6 +7,12 @@ namespace MDM.Model.Plant.Dto /// public class PlantFactorySiteQueryDto : PagerInfo { + public string SiteCode { get; set; } + + public string SiteName { get; set; } + + public string SiteType { get; set; } + public int? Status { get; set; } } /// diff --git a/MES_Model/Services/Plant/PlantFactorySiteService.cs b/MES_Model/Services/Plant/PlantFactorySiteService.cs index 9d780d0..301a654 100644 --- a/MES_Model/Services/Plant/PlantFactorySiteService.cs +++ b/MES_Model/Services/Plant/PlantFactorySiteService.cs @@ -25,7 +25,12 @@ namespace MDM.Services.Plant /// public PagedInfo GetList(PlantFactorySiteQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.SiteCode), it => it.SiteCode.Contains(parm.SiteCode)) + .AndIF(!string.IsNullOrEmpty(parm.SiteName), it => it.SiteCode.Contains(parm.SiteName)) + .AndIF(!string.IsNullOrEmpty(parm.SiteType), it => it.SiteType == parm.SiteType) + .AndIF(parm.Status != null, it => it.Status == parm.Status) + ; var response = Queryable() .Where(predicate.ToExpression())