From 9ddec4808631025d36d3c5a816d55ef77a29d4c7 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期三, 16 七月 2025 17:30:30 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/util/Settings.cs | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/util/Settings.cs
index 0ee5e19..61ca3b3 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/util/Settings.cs
@@ -17,14 +17,13 @@
public static string AppKey { get; set; }
public static string AppSecret { get; set; }
public static List<deviceInfo> deviceInfos { get; set; }
- public static List<ErrorInfos> agvErrorCode1 { get; set; }
- public static List<ErrorInfos> agvErrorCode2 { get; set; }
- public static List<ErrorInfos> agvFaildCode { get; set; }
+
public static List<TableUrl> tableUrls { get; set; }
public static List<ErrorInfos> dpjErrorInfos { get; set; }
public static List<ElevatorLoc> elevatorLoc { get; set; }
public static List<LocAreabyItem> locAreabyItem { get; set; }
public static List<WareLoc> wareLoc { get; set; }
+ public static List<AgvError> agvError { get; set; }
public static int port { get; set; }
public static string WHCode { get; set; }
public static string FacCode { get; set; }
@@ -97,17 +96,9 @@
{
OLMA_LOC = JsonConvert.DeserializeObject<string[]>(keyValue.Value.ToString());
}
- if (keyValue.Name == "AgvFaildCode")
+ if (keyValue.Name == "AgvError")
{
- agvErrorCode1 = JsonConvert.DeserializeObject<List<ErrorInfos>>(keyValue.Value.ToString());
- }
- if (keyValue.Name == "AgvErrorCode1")
- {
- agvErrorCode2 = JsonConvert.DeserializeObject<List<ErrorInfos>>(keyValue.Value.ToString());
- }
- if (keyValue.Name == "AgvErrorCode2")
- {
- agvFaildCode = JsonConvert.DeserializeObject<List<ErrorInfos>>(keyValue.Value.ToString());
+ agvError = JsonConvert.DeserializeObject<List<AgvError>>(keyValue.Value.ToString());
}
if (keyValue.Name == "DeviceInfo")
{
@@ -202,6 +193,18 @@
public string PMK { get; set; }
public string ZCW { get; set; }
public string ZCW2 { get; set; }
+ public string[] XbAreaCodes { get; set; }
+
+ }
+
+ public class AgvError
+ {
+ public string[] agvNo { get; set; }
+ public string agvName { get; set; }
+
+ public List<ErrorInfos> AgvErrorCode1 { get; set; }
+ public List<ErrorInfos> AgvErrorCode2 { get; set; }
+ public List<ErrorInfos> AgvFaildCode { get; set; }
}
}
}
--
Gitblit v1.9.1