diff --git a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmLevelController.cs b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmLevelController.cs
index 1925cffe..aec6e13e 100644
--- a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmLevelController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmLevelController.cs
@@ -103,7 +103,16 @@ namespace ZR.Admin.WebApi.Controllers.andon
}
-
+ ///
+ /// 查询报警等级下拉列表
+ ///
+ ///
+ [HttpGet("getPullDowm")]
+ public ApiResult GetPullDowm()
+ {
+ var response = _AndonAlarmLevelService.GetPullDowm();
+ return response;
+ }
}
}
\ No newline at end of file
diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmLevelDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmLevelDto.cs
index f2424eea..544433d5 100644
--- a/ZR.Model/MES/andon/Dto/AndonAlarmLevelDto.cs
+++ b/ZR.Model/MES/andon/Dto/AndonAlarmLevelDto.cs
@@ -37,4 +37,10 @@ namespace ZR.Model.MES.andon.Dto
}
+ public class AlarmLevelPullDownDto
+ {
+ public string label { get; set; }
+ public string value { get; set; }
+ }
+
}
\ No newline at end of file
diff --git a/ZR.Service/mes/andon/AndonAlarmLevelService.cs b/ZR.Service/mes/andon/AndonAlarmLevelService.cs
index 04277946..dd1bfdcf 100644
--- a/ZR.Service/mes/andon/AndonAlarmLevelService.cs
+++ b/ZR.Service/mes/andon/AndonAlarmLevelService.cs
@@ -1,5 +1,7 @@
using Infrastructure.Attribute;
+using Infrastructure.Model;
using SqlSugar;
+using System;
using ZR.Model;
using ZR.Model.MES.andon;
using ZR.Model.MES.andon.Dto;
@@ -80,5 +82,22 @@ namespace ZR.Service.mes.andon
return Update(model, true);
}
+ public ApiResult GetPullDowm()
+ {
+ try
+ {
+ var response = Queryable()
+ .Select(it => new AlarmLevelPullDownDto
+ {
+ label = it.LevelName,
+ value = it.LightColor
+ }).ToList();
+ return ApiResult.Success("成功", response);
+ }
+ catch (Exception ex)
+ {
+ return ApiResult.Error(ex.Message);
+ }
+ }
}
}
\ No newline at end of file
diff --git a/ZR.Service/mes/andon/IService/IAndonAlarmLevelService.cs b/ZR.Service/mes/andon/IService/IAndonAlarmLevelService.cs
index 32d8cf6f..da8b7551 100644
--- a/ZR.Service/mes/andon/IService/IAndonAlarmLevelService.cs
+++ b/ZR.Service/mes/andon/IService/IAndonAlarmLevelService.cs
@@ -3,6 +3,7 @@ using ZR.Model;
using System.Collections.Generic;
using ZR.Model.MES.andon;
using ZR.Model.MES.andon.Dto;
+using Infrastructure.Model;
namespace ZR.Service.mes.andon.Iservice
{
@@ -18,6 +19,6 @@ namespace ZR.Service.mes.andon.Iservice
AndonAlarmLevel AddAndonAlarmLevel(AndonAlarmLevel parm);
int UpdateAndonAlarmLevel(AndonAlarmLevel parm);
-
+ ApiResult GetPullDowm();
}
}