diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs b/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs index ebf23db..96f0d2b 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs +++ b/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs @@ -263,7 +263,7 @@ namespace ZR.Admin.WebApi.Controllers { if(query==null) { - SUCCESS(null); + return SUCCESS(null); } if(query.PlanType!=1&&query.PlanType!=2) { @@ -277,5 +277,17 @@ namespace ZR.Admin.WebApi.Controllers } + [HttpPost("update_form_result")] + public IActionResult UpdateFormResult([FromBody] DeviceTaskExecuteResult1Dto result) + { + if(result==null) + { + return SUCCESS(null); + } + + int res=_DeviceTaskExecuteService.UpdateFormResult(result); + return SUCCESS(res); + } + } } \ No newline at end of file diff --git a/ZR.Service/MES/dev/DeviceTaskExecuteService.cs b/ZR.Service/MES/dev/DeviceTaskExecuteService.cs index f233b82..50cb9a1 100644 --- a/ZR.Service/MES/dev/DeviceTaskExecuteService.cs +++ b/ZR.Service/MES/dev/DeviceTaskExecuteService.cs @@ -510,10 +510,6 @@ namespace ZR.Service.MES.dev { item.Value = item.Children[0]; } - - - - final_result_list.Add(item); } } @@ -523,5 +519,17 @@ namespace ZR.Service.MES.dev return final_result_list; } + + /// + /// 更新结果表单 + /// + /// + /// + public int UpdateFormResult(DeviceTaskExecuteResult1Dto result) + { + return Context.Updateable(result).IgnoreColumns(true).EnableDiffLogEvent("更新结果表单").ExecuteCommand(); + } + + } } \ No newline at end of file diff --git a/ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs b/ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs index 0706293..11987e8 100644 --- a/ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs +++ b/ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs @@ -38,5 +38,7 @@ namespace ZR.Service.MES.dev.IService List AchieveFormResult(DeviceTaskExecuteResult1QueryDto_TaskExecute query); + int UpdateFormResult(DeviceTaskExecuteResult1Dto result); + } }