From 766d0cae552e0e549b302a1763d113416346832a Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期二, 10 六月 2025 17:21:44 +0800
Subject: [PATCH] jushi
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/util/Settings.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/util/Settings.cs
index b5d6447..0acfd26 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/util/Settings.cs
@@ -21,7 +21,7 @@
public static List<PriorityLoc> PriorityLocs { get; set; }
public static List<ConveyorLinesInfo> ConveyorLinesInfos { get; set; }
public static List<linePlcInfo> linePlcInfos { get; set; }
- public static List<SafeDoor> SafeDoors { get; set; }
+ public static List<SafeInteraction> SafeInteractions { get; set; }
public static int port { get; set; }
public static string WHCode { get; set; }
public static string FacCode { get; set; }
@@ -110,9 +110,9 @@
{
PriorityLocs = JsonConvert.DeserializeObject<List<PriorityLoc>>(keyValue.Value.ToString());
}
- if (keyValue.Name == "SafeDoor")
+ if (keyValue.Name == "SafeInteraction")
{
- SafeDoors = JsonConvert.DeserializeObject<List<SafeDoor>>(keyValue.Value.ToString());
+ SafeInteractions = JsonConvert.DeserializeObject<List<SafeInteraction>>(keyValue.Value.ToString());
}
}
}
@@ -188,15 +188,18 @@
public class PriorityLoc
{
public string Location { get; set; }
+ public string Name { get; set; }
public string PrimaryArea { get; set; }
public string SecondaryArea { get; set; }
}
- public class SafeDoor
+ public class SafeInteraction
{
public string pointCode { get; set; }
+ public int code{ get; set; }
public string ip { get; set; }
- public string port { get; set; }
+ public string type { get; set; }
+ public string location { get; set; }
}
}
--
Gitblit v1.9.1