From a93b0e99036c24b9bd58c79bf5e7364b1ba28bae Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期二, 01 七月 2025 16:02:33 +0800
Subject: [PATCH] 福建佳通-流程优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/util/Settings.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/util/Settings.cs
index 1926b76..733ba17 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/util/Settings.cs
@@ -13,13 +13,15 @@
{
public static string HostToAgvServerUrl { get; set; }
public static string HASeverUrl { get; set; }
- public static string SqlServer { get; set; }
+ public static string SqlServer { get; set; }
public static string SqlServer1 { get; set; }
public static List<ConnectLoc> connectLocList { get; set; }
+ public static List<OnLineLoc> onLineLocList { get; set; }
+ public static List<CallOutLoc> callOutLocList { get; set; }
+ public static List<DeviceConfig> deviceConfigList { get; set; }
public static int port { get; set; }
public static string WHCode { get; set; }
public static string FacCode { get; set; }
- public static string abnormalArea { get; set; }
public static string stockArea { get; set; }
@@ -56,9 +58,17 @@
if (keyValue.Name == "ConnectLoc") {
connectLocList = JsonConvert.DeserializeObject<List<ConnectLoc>>(keyValue.Value.ToString());
}
- if (keyValue.Name == "AbnormalArea")
+ if (keyValue.Name == "OnLineLoc")
{
- abnormalArea = keyValue.Value.ToString();
+ onLineLocList = JsonConvert.DeserializeObject<List<OnLineLoc>>(keyValue.Value.ToString());
+ }
+ if (keyValue.Name == "CallOutLoc")
+ {
+ callOutLocList = JsonConvert.DeserializeObject<List<CallOutLoc>>(keyValue.Value.ToString());
+ }
+ if (keyValue.Name == "DeviceConfig")
+ {
+ deviceConfigList = JsonConvert.DeserializeObject<List<DeviceConfig>>(keyValue.Value.ToString());
}
if (keyValue.Name == "StockArea")
{
@@ -76,13 +86,30 @@
}
+ public class DeviceConfig
+ {
+ public string deviceNo { get; set; }
+ public string deviceName { get; set; }
+ public int roadway { get; set; }
+ }
public class ConnectLoc
{
public string locCode { get; set; }
public int roadway { get; set; }
+ }
+
+ public class OnLineLoc
+ {
+ public string locCode { get; set; }
public int type { get; set; }
}
-
+
+ public class CallOutLoc
+ {
+ public string locCode { get; set; }
+ public int row { get; set; }
+ }
+
}
}
--
Gitblit v1.9.1