From be7bdd640cd1ca9d59a76ba367af938004b65d0b Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Wed, 5 Jun 2024 13:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=93=E6=9E=9C=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/dev/DeviceTaskExecuteController.cs       | 14 +++++++++++++-
 ZR.Service/MES/dev/DeviceTaskExecuteService.cs   | 16 ++++++++++++----
 .../dev/IService/IDeviceTaskExecuteService.cs    |  2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

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;
 
         }
+    
+        /// <summary>
+        /// 更新结果表单
+        /// </summary>
+        /// <param name="result"></param>
+        /// <returns></returns>
+        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<DeviceTaskExecuteResult1_result> AchieveFormResult(DeviceTaskExecuteResult1QueryDto_TaskExecute query);
 
+      int   UpdateFormResult(DeviceTaskExecuteResult1Dto result);
+
     }
 }