Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安灯报警记录修改

Browse Source
This commit is contained in:
quowingwang
2025-12-19 16:59:37 +08:00
parent dda5841865
commit 59d54b20a5
3 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ZR.Model/MES/andon/AndonAlarmRecord.cs
View File

@@ -19,17 +19,12 @@ namespace ZR.Model.MES.andon
[SugarColumn(ColumnName = "alarm_code")] [SugarColumn(ColumnName = "alarm_code")]
public string AlarmCode { get; set; } public string AlarmCode { get; set; }
/// <summary>
/// 产线
/// </summary>
[SugarColumn(ColumnName = "line_code")]
public string LineCode { get; set; }
/// <summary> /// <summary>
/// 产线名称 /// 报警类型编码
/// </summary> /// </summary>
[SugarColumn(ColumnName = "line_name")] [SugarColumn(ColumnName = "alarm_type_code")]
public string LineName { get; set; } public string AlarmTypeCode { get; set; }
/// <summary> /// <summary>
/// 报警类型 /// 报警类型
@@ -112,8 +107,5 @@ namespace ZR.Model.MES.andon
[SugarColumn(ColumnName = "updated_time")] [SugarColumn(ColumnName = "updated_time")]
public DateTime? UpdatedTime { get; set; } public DateTime? UpdatedTime { get; set; }
[SugarColumn(ColumnName = "sequcence")]
public int Sequcence { get; set; }
} }
} }

4
ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
View File

@@ -21,9 +21,7 @@ namespace ZR.Model.MES.andon.Dto
public string AlarmCode { get; set; } public string AlarmCode { get; set; }
public string LineCode { get; set; } public string AlarmTypeCode { get; set; }
public string LineName { get; set; }
public string AlarmType { get; set; } public string AlarmType { get; set; }

12
ZR.Service/mes/andon/AndonAlarmRecordService.cs
View File

@@ -284,18 +284,18 @@ namespace ZR.Service.mes.andon
public AndonAlarmRecord CreateAndonAlarmRecord(AndonAlarmRecord model) public AndonAlarmRecord CreateAndonAlarmRecord(AndonAlarmRecord model)
{ {
string strDay = DateTime.Now.ToString("yyyyMMdd"); string strDay = DateTime.Now.ToString("yyyyMMdd");
int Sequcence = 1; int Sequence = 1;
AndonAlarmRecord item = Queryable() AndonAlarmRecord item = Queryable()
.Where(it => it.AlarmCode.Contains(strDay)).OrderByDescending(it => it.Sequcence).First(); .Where(it => it.AlarmCode.Contains(strDay)).OrderByDescending(it => it.Sequence).First();
if (item != null) if (item != null)
{ {
Sequcence = item.Sequcence; Sequence = (int)item.Sequence;
Sequcence += 1; Sequence += 1;
} }
string formattedSequence = Sequcence.ToString("D4"); string formattedSequence = Sequence.ToString("D4");
string strAlarmCode = "Alarm" + strDay + formattedSequence; string strAlarmCode = "Alarm" + strDay + formattedSequence;
model.AlarmCode = strAlarmCode; model.AlarmCode = strAlarmCode;
model.Sequcence = Sequcence; model.Sequence = Sequence;
return Context.Insertable(model).ExecuteReturnEntity(); return Context.Insertable(model).ExecuteReturnEntity();
} }