报警响应
This commit is contained in:
@@ -181,6 +181,46 @@ namespace ZR.Service.mes.andon
|
||||
//{
|
||||
// return ApiResult.Error(500, ex.Message);
|
||||
//}
|
||||
|
||||
try
|
||||
{
|
||||
var response = new ApiResult();
|
||||
if (parm != null)
|
||||
{
|
||||
var record = Queryable()
|
||||
.Where(x => x.Id == parm.Id)
|
||||
.First();
|
||||
if (record != null)
|
||||
{
|
||||
record.Status = "已响应";
|
||||
record.Remarks = parm.Remarks;
|
||||
record.UpdatedBy = parm.UserId;
|
||||
record.UpdatedTime = DateTime.Now;
|
||||
UpdateAndonAlarmRecord(record);
|
||||
AndonAlarmRecordProcess andonAlarmRecordProcess = new AndonAlarmRecordProcess();
|
||||
andonAlarmRecordProcess.AlarmCode = record.AlarmCode;
|
||||
andonAlarmRecordProcess.Operate = record.Status;
|
||||
andonAlarmRecordProcess.CreatedBy = parm.UserId;
|
||||
andonAlarmRecordProcess.CreatedName = parm.UserName;
|
||||
andonAlarmRecordProcess.CreatedTime = DateTime.Now;
|
||||
andonAlarmRecordProcess.UpdatedBy = parm.UserId;
|
||||
andonAlarmRecordProcess.UpdatedName = parm.UserName;
|
||||
andonAlarmRecordProcess.UpdatedTime = DateTime.Now;
|
||||
int iResult = andonAlarmRecordProcessService.Insert(andonAlarmRecordProcess);
|
||||
return ApiResult.Success("成功", andonAlarmRecordProcess);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
response.Code = 500;
|
||||
response.Msg = "参数不能为空";
|
||||
}
|
||||
return response;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return ApiResult.Error(500, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -197,14 +237,15 @@ namespace ZR.Service.mes.andon
|
||||
var record = Queryable()
|
||||
.Where(x => x.Id == parm.Id)
|
||||
.First();
|
||||
if(parm.Status == "及时响应")
|
||||
{
|
||||
record.Status = "及时处理";
|
||||
}
|
||||
else
|
||||
{
|
||||
record.Status = "超时处理";
|
||||
}
|
||||
//if(parm.Status == "及时响应")
|
||||
//{
|
||||
// record.Status = "及时处理";
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// record.Status = "超时处理";
|
||||
//}
|
||||
record.Status = "已处理";
|
||||
record.HandleResult = parm.HandleResult;
|
||||
record.Remarks = parm.Remarks;
|
||||
record.UpdatedBy = parm.UserId;
|
||||
@@ -241,13 +282,13 @@ namespace ZR.Service.mes.andon
|
||||
{
|
||||
return ApiResult.Error(500, "参数不能为空");
|
||||
}
|
||||
if (parm.Status == "待响应" || parm.Status == "及时响应" || parm.Status == "超时响应")
|
||||
if (parm.Status == "待响应" || parm.Status == "已响应")
|
||||
{
|
||||
var record = Queryable()
|
||||
.Where(x => x.Id == parm.Id)
|
||||
.First();
|
||||
|
||||
record.Status = "主动上报";
|
||||
record.Status = "已上报";
|
||||
record.Remarks = parm.Remarks;
|
||||
record.UpdatedBy = parm.UserId;
|
||||
record.UpdatedTime = DateTime.Now;
|
||||
@@ -296,6 +337,7 @@ namespace ZR.Service.mes.andon
|
||||
string strAlarmCode = "Alarm" + strDay + formattedSequence;
|
||||
model.AlarmCode = strAlarmCode;
|
||||
model.Sequence = Sequence;
|
||||
model.Status = "待响应";
|
||||
return Context.Insertable(model).ExecuteReturnEntity();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user