From 3b4abc97fbc219a9735267183a3e30afcfc0c794 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 5 Jul 2024 14:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MES/andon/AndonInteractionController.cs   | 4 ++--
 DOAN.Service/MES/dev/DeviceAccountService.cs              | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs
index 1886103..2af86ca 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs
@@ -35,7 +35,7 @@ namespace DOAN.WebApi.Controllers.MES.andon
 
             }
             AndonFaultRecord record = query.Adapt<AndonFaultRecord>();
-            record.ToCreate();
+            record.ToCreate(HttpContext);
             var response = _andonInteractionService.CallHandle(record);
             return SUCCESS(response);
         }
@@ -64,7 +64,7 @@ namespace DOAN.WebApi.Controllers.MES.andon
 
             }
             AndonFaultRecord record = response.Adapt<AndonFaultRecord>();
-            record.ToUpdate();
+            record.ToUpdate(HttpContext);
             var res = _andonInteractionService.SignIn(record);
             return SUCCESS(res);
 
diff --git a/DOAN.Service/MES/dev/DeviceAccountService.cs b/DOAN.Service/MES/dev/DeviceAccountService.cs
index fb60e61..ab7db55 100644
--- a/DOAN.Service/MES/dev/DeviceAccountService.cs
+++ b/DOAN.Service/MES/dev/DeviceAccountService.cs
@@ -326,8 +326,8 @@ namespace DOAN.Service.MES.dev
                 .OrderBy(it => it.Id)
                 .Select(it => new SelectTreeDto
                 {
-                    Id = it.Id.ToString(),
-                    ParentId = it.ParentId.ToString(),
+                    Id =(it.Id * 10000).ToString(),
+                    ParentId = (it.ParentId*10000).ToString(),
                     Label = it.Name,
                     Value = it.Name
                 })
@@ -338,8 +338,8 @@ namespace DOAN.Service.MES.dev
                 .Select(it => new SelectTreeDto
                 {
                    // Id = it.Id.ToString() + it.FkDeviceType.ToString(),//解决合并后id重复
-                    Id = (it.Id*10000).ToString() ,//解决合并后id重复
-                    ParentId = it.FkDeviceType.ToString(),
+                    Id = it.Id.ToString(),//解决合并后id重复
+                    ParentId = (it.FkDeviceType*10000).ToString(),
                     Label = it.DeviceCode + "||" +it.DeviceName ,
                     Value = it.Id.ToString()
                 }).ToList();