diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
index 2c2cb7a6..f135c9a5 100644
--- a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
+++ b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
@@ -9,6 +9,9 @@ namespace ZR.Model.MES.andon.Dto
     {
         public DateTime startTime { get; set; }
         public DateTime endTime { get; set; }
+
+        public string AlarmCode { get; set; }
+        public string AlarmTypeCode { get; set; }
     }
 
     /// <summary>
diff --git a/ZR.Service/mes/andon/AndonAlarmRecordService.cs b/ZR.Service/mes/andon/AndonAlarmRecordService.cs
index 37a2de0a..8906f346 100644
--- a/ZR.Service/mes/andon/AndonAlarmRecordService.cs
+++ b/ZR.Service/mes/andon/AndonAlarmRecordService.cs
@@ -40,6 +40,14 @@ namespace ZR.Service.mes.andon
                 {
                     predicate = predicate.And(it => it.CreatedTime <= parm.endTime);
                 }
+                if (!string.IsNullOrEmpty(parm.AlarmCode))
+                {
+                    predicate = predicate.And(it => it.AlarmCode.Contains(parm.AlarmCode));
+                }
+                if (!string.IsNullOrEmpty(parm.AlarmTypeCode))
+                {
+                    predicate = predicate.And(it => it.AlarmTypeCode == parm.AlarmTypeCode);
+                }
             }
             var response = Queryable()
                 .Where(predicate.ToExpression())