diff --git a/ZR.Model/MES/andon/AndonAlarmRecord.cs b/ZR.Model/MES/andon/AndonAlarmRecord.cs index 265fcfcb..11a8b419 100644 --- a/ZR.Model/MES/andon/AndonAlarmRecord.cs +++ b/ZR.Model/MES/andon/AndonAlarmRecord.cs @@ -47,7 +47,8 @@ namespace ZR.Model.MES.andon /// /// 接收方 /// - public string Receiver { get; set; } + [SugarColumn(ColumnName = "receiver")] + public int Receiver { get; set; } /// /// 接收方名称 @@ -55,9 +56,19 @@ namespace ZR.Model.MES.andon [SugarColumn(ColumnName = "receiver_name")] public string ReceiverName { get; set; } + /// + /// 管理方 + /// + [SugarColumn(ColumnName = "manager")] + public int Manager { get; set; } + + [SugarColumn(ColumnName = "manager_name")] + public string ManagerName { get; set; } + /// /// 序号 /// + [SugarColumn(ColumnName = "sequence")] public int? Sequence { get; set; } /// diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs index d6edb38a..2c2cb7a6 100644 --- a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs +++ b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs @@ -29,10 +29,14 @@ namespace ZR.Model.MES.andon.Dto public string AlarmInfo { get; set; } - public string Receiver { get; set; } + public int Receiver { get; set; } public string ReceiverName { get; set; } + public int Manager { get; set; } + + public string ManagerName { get; set; } + public int? Sequence { get; set; } public int? DurationTime { get; set; }