diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs index bf2add09..1768ebad 100644 --- a/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs +++ b/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs @@ -7,6 +7,7 @@ namespace ZR.Model.MES.andon.Dto /// public class AndonAlarmTypeDictQueryDto : PagerInfo { + public string TypeName { get; set; } } /// diff --git a/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs b/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs index 69313b72..6d84527e 100644 --- a/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs +++ b/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs @@ -25,7 +25,10 @@ namespace ZR.Service.mes.andon public PagedInfo GetList(AndonAlarmTypeDictQueryDto parm) { var predicate = Expressionable.Create(); - + if (!string.IsNullOrEmpty(parm.TypeName)) + { + predicate.And(x => x.TypeName.Contains(parm.TypeName)); + } var response = Queryable() .Where(predicate.ToExpression()) .ToPage(parm);