diff --git a/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs
index 70ebdde..901034a 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs
@@ -312,6 +312,8 @@ namespace DOAN.Admin.WebApi.Controllers
int res=_DeviceTaskExecuteService.UpdateFormResult(result);
return SUCCESS(res);
}
+
+
///
/// 增加任务开始时间
///
diff --git a/DOAN.Model/MES/dev/DeviceTaskExecute.cs b/DOAN.Model/MES/dev/DeviceTaskExecute.cs
index 0b7e2ac..80521a3 100644
--- a/DOAN.Model/MES/dev/DeviceTaskExecute.cs
+++ b/DOAN.Model/MES/dev/DeviceTaskExecute.cs
@@ -25,6 +25,12 @@ namespace DOAN.Model.MES.dev
[SugarColumn(ColumnName = "task_id")]
public string TaskId { get; set; }
+ ///
+ /// 执行人
+ ///
+ [SugarColumn(ColumnName = "person")]
+ public string Person { get; set; }
+
///
/// 任务类型(1是巡检,2是点检)
///
diff --git a/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs
index 265a754..3fd3bf4 100644
--- a/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs
+++ b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs
@@ -33,6 +33,8 @@ namespace DOAN.Model.MES.dev.Dto
///
public class DeviceTaskExecuteResultDto
{
+
+ public string taskExecute_id { get; set; }
[Required(ErrorMessage = "id 雪花不能为空")]
public string Id { get; set; }
diff --git a/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs b/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs
index 7df5735..4f3e953 100644
--- a/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs
+++ b/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs
@@ -705,6 +705,9 @@ namespace DOAN.Service.MES.dev
///
public int UpdateFormResult(DeviceTaskExecuteResultDto result)
{
+ if (!string.IsNullOrEmpty(result.taskExecute_id))
+ Context.Updateable().Where(it => it.Id == result.taskExecute_id).SetColumns(it => it.Person == result.UpdatedBy).ExecuteCommand();
+
result.Person = result.UpdatedBy;
DeviceTaskExecuteResult item = result.Adapt();