From c70b1831b343230eb412cca454ddc578440cb92b Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Sat, 20 Dec 2025 16:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=AD=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/andon/AndonAlarmRecordController.cs           | 11 ++++++++++-
 ZR.Admin.WebApi/Program.cs                            |  2 +-
 ZR.Model/MES/andon/AndonAlarmRecord.cs                |  6 ++++++
 ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs         |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs
index 7f57baf3..29105514 100644
--- a/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/andon/AndonAlarmRecordController.cs
@@ -165,7 +165,16 @@ namespace ZR.Admin.WebApi.Controllers.andon
         public IActionResult CreateAndonAlarmRecord([FromBody] AndonAlarmRecordDto parm)
         {
             var modal = parm.Adapt<AndonAlarmRecord>().ToCreate(HttpContext);
-
+            if (parm.Area != null && parm.Area.Length > 0)
+            {
+                modal.Area1 = parm.Area.Length > 0 ? parm.Area[0] : string.Empty;
+                modal.Area2 = parm.Area.Length > 1 ? parm.Area[1] : string.Empty;
+            }
+            else
+            {
+                modal.Area1 = string.Empty;
+                modal.Area2 = string.Empty;
+            }
             var response = _AndonAlarmRecordService.CreateAndonAlarmRecord(modal);
 
             return SUCCESS(response);
diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs
index 455b28e1..c9df7e6e 100644
--- a/ZR.Admin.WebApi/Program.cs
+++ b/ZR.Admin.WebApi/Program.cs
@@ -115,7 +115,7 @@ builder.Services.Configure<ApiBehaviorOptions>((o) =>
 // 注册 SocketGatewayServer 为 Singleton（单例，整个应用生命周期一个实例）
 builder.Services.AddSingleton<SocketGatewayServer>(provider =>
 {
-    var server = new SocketGatewayServer("192.168.1.10", 2325); // 你可以按需修改 IP 和端口
+    var server = new SocketGatewayServer("192.168.1.48", 2325); // 你可以按需修改 IP 和端口
     server.Start(); // 项目启动时立即启动监听
     //server.StartReceiving();
 
diff --git a/ZR.Model/MES/andon/AndonAlarmRecord.cs b/ZR.Model/MES/andon/AndonAlarmRecord.cs
index e0e1ce0f..da512900 100644
--- a/ZR.Model/MES/andon/AndonAlarmRecord.cs
+++ b/ZR.Model/MES/andon/AndonAlarmRecord.cs
@@ -140,5 +140,11 @@ namespace ZR.Model.MES.andon
         [SugarColumn(ColumnName = "updated_time")]
         public DateTime? UpdatedTime { get; set; }
 
+        [SugarColumn(ColumnName = "area1")]
+        public string Area1 { get; set; }
+
+        [SugarColumn(ColumnName = "area2")]
+        public string Area2 { get; set; }
+
     }
 }
\ No newline at end of file
diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
index 69e3d0f9..592bd1f3 100644
--- a/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
+++ b/ZR.Model/MES/andon/Dto/AndonAlarmRecordDto.cs
@@ -65,5 +65,6 @@ namespace ZR.Model.MES.andon.Dto
         public string UserId { get; set; }
         public string UserName { get; set; }
 
+        public string[] Area { get; set; }
     }
 }
\ No newline at end of file