From 22a53016fd083615735d9f54edc40000a79fdad6 Mon Sep 17 00:00:00 2001 From: quowingwang Date: Sun, 21 Dec 2025 15:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/andon/AndonAlarmRecordService.cs | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/ZR.Service/mes/andon/AndonAlarmRecordService.cs b/ZR.Service/mes/andon/AndonAlarmRecordService.cs index 2a2dae28..e5362031 100644 --- a/ZR.Service/mes/andon/AndonAlarmRecordService.cs +++ b/ZR.Service/mes/andon/AndonAlarmRecordService.cs @@ -107,30 +107,45 @@ namespace ZR.Service.mes.andon /// public int UpdateAndonAlarmRecord(AndonAlarmRecord model) { - //var response = Update(w => w.Id == model.Id, it => new AndonAlarmRecord() - //{ - // AlarmCode = model.AlarmCode, - // LineCode = model.LineCode, - // LineName = model.LineName, - // AlarmType = model.AlarmType, - // AlarmLevel = model.AlarmLevel, - // AlarmInfo = model.AlarmInfo, - // Sender = model.Sender, - // SenderName = model.SenderName, - // SendTime = model.SendTime, - // Receiver = model.Receiver, - // ReceiverName = model.ReceiverName, - // Sequence = model.Sequence, - // DurationTime = model.DurationTime, - // Status = model.Status, - // HandleResult = model.HandleResult, - // Remarks = model.Remarks, - // CreatedBy = model.CreatedBy, - // CreatedTime = model.CreatedTime, - // UpdatedBy = model.UpdatedBy, - // UpdatedTime = model.UpdatedTime, - //}); - //return response; + if (model != null && !string.IsNullOrEmpty(model.AlarmTypeCode)) + { + var typeDic = andonAlarmTypeDictService.Queryable() + .Where(k => k.TypeCode == model.AlarmTypeCode) + .ToList().FirstOrDefault(); + if (typeDic != null) + { + model.Receiver1 = typeDic.Receiver1; + model.Receiver1Name = typeDic.Receiver1Name; + model.Receiver2 = typeDic.Receiver2; + model.Receiver2Name = typeDic.Receiver2Name; + model.Receiver3 = typeDic.Receiver3; + model.Receiver3Name = typeDic.Receiver3Name; + model.Receiver4 = typeDic.Receiver4; + model.Receiver4Name = typeDic.Receiver4Name; + } + else + { + model.Receiver1 = null; + model.Receiver1Name = string.Empty; + model.Receiver2 = null; + model.Receiver2Name = string.Empty; + model.Receiver3 = null; + model.Receiver3Name = string.Empty; + model.Receiver4 = null; + model.Receiver4Name = string.Empty; + } + } + else + { + model.Receiver1 = null; + model.Receiver1Name = string.Empty; + model.Receiver2 = null; + model.Receiver2Name = string.Empty; + model.Receiver3 = null; + model.Receiver3Name = string.Empty; + model.Receiver4 = null; + model.Receiver4Name = string.Empty; + } return Update(model, true); }