区域下拉

ZR.Service/mes/andon/AndonAlarmAreaService.cs

@@ -1,4 +1,5 @@
 using Infrastructure.Attribute;
+using Infrastructure.Model;
 using SqlSugar;
 using ZR.Model;
 using ZR.Model.MES.andon;
@@ -75,5 +76,31 @@ namespace ZR.Service.mes.andon
             return Update(model, true);
         }
 
+        public ApiResult GetPullDown()
+        {
+            var response = Queryable()
+                 .Where(a => a.ParentId == null || a.ParentId == 0)
+                           .Select(a => new AlarmAreaPullDownDto
+                           {
+                               label = a.Area,
+                               value = a.Id,
+                               children = new List<AlarmAreaPullDown2Dto>()
+                           })
+                           .ToList();
+            foreach (var item in response)
+            { 
+                item.children = Queryable()
+                    .Where(a => a.ParentId == item.value)
+                    .Select(a => new AlarmAreaPullDown2Dto
+                    {
+                        label = a.Area,
+                        value = a.Id,
+                    })
+                    .ToList();
+            }
+            return ApiResult.Success("成功", response);
+        }
+
+
     }
 }

ZR.Service/mes/andon/AndonAlarmLevelService.cs

@@ -89,7 +89,7 @@ namespace ZR.Service.mes.andon
                 .Select(it => new AlarmLevelPullDownDto
                 {
                     label = it.LevelName,
-                    value = it.LightColor
+                    value = it.LevelName,
                 }).ToList();
                 return ApiResult.Success("成功", response);
             }

ZR.Service/mes/andon/AndonAlarmRecordService.cs

@@ -22,6 +22,7 @@ namespace ZR.Service.mes.andon
     {
         private AndonAlarmLevelService andonAlarmLevelService = new AndonAlarmLevelService();
         private AndonAlarmRecordProcessService andonAlarmRecordProcessService = new AndonAlarmRecordProcessService();
+        private AndonAlarmTypeDictService andonAlarmTypeDictService = new AndonAlarmTypeDictService();
         /// <summary>
         /// 查询报警记录列表
         /// </summary>
@@ -201,6 +202,20 @@ namespace ZR.Service.mes.andon
                     {
                         record.Status = "已响应";
                         record.Remarks = parm.Remarks;
+                        var typeDic = andonAlarmTypeDictService.Queryable()
+                            .Where(k => k.TypeCode == record.AlarmTypeCode)
+                            .ToList().FirstOrDefault();
+                        if (typeDic != null)
+                        {
+                            record.Receiver1 = typeDic.Receiver1;
+                            record.Receiver1Name = typeDic.Receiver1Name;
+                            record.Receiver2 = typeDic.Receiver2;
+                            record.Receiver2Name = typeDic.Receiver2Name;
+                            record.Receiver3 = typeDic.Receiver3;
+                            record.Receiver3Name = typeDic.Receiver3Name;
+                            record.Receiver4 = typeDic.Receiver4;
+                            record.Receiver4Name = typeDic.Receiver4Name;
+                        }
                         record.UpdatedBy = parm.UserId;
                         record.UpdatedTime = DateTime.Now;
                         UpdateAndonAlarmRecord(record);

ZR.Service/mes/andon/AndonAlarmTypeDictService.cs

@@ -86,8 +86,7 @@ namespace ZR.Service.mes.andon
                 .Select(it => new AlarmTypePullDownDto
                 {
                     label = it.TypeCode,
-                    value = it.TypeName,
-                    ResponseTime = it.ResponseTime
+                    value = it.TypeName
                 }).ToList();
                 return ApiResult.Success("成功", response);
             }

ZR.Service/mes/andon/IService/IAndonAlarmAreaService.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 {
         AndonAlarmArea AddAndonAlarmArea(AndonAlarmArea parm);
 
         int UpdateAndonAlarmArea(AndonAlarmArea parm);
-
+        ApiResult GetPullDown();
     }
 }