From f80938e8a03d9343672b4fb3179836b019f6b9d8 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期六, 28 六月 2025 21:38:46 +0800
Subject: [PATCH] 0628
---
util/Settings.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index f405bf0..fcc8827 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -17,6 +17,13 @@
public static string TmDeviceIp { get; set; }
+
+
+ //hosttoagv閴存潈
+ //public static string AppKey { get; set; }
+ //public static string AppSecret { get; set; }
+
+
public static int TmDevicePort { get; set; }
public static List<safetyLocation> safetyLocations { get; set; }
@@ -32,14 +39,28 @@
/// </summary>
public static string MesGetItemApi { get; set; }
+ /// <summary>
+ /// 閰嶇疆
+ /// </summary>
public static List<deviceInfo> deviceInfos { get; set; }
-
+ /// <summary>
+ /// 鑳庨潰璁惧閰嶇疆
+ /// </summary>
public static List<TmDeviceInfo> TmDeviceInfos { get; set; }
public static List<areaInfo> areaInfos { get; set; }
+ /// <summary>
+ /// 浼樺厛绾ч厤缃�+ /// </summary>
+ //public static OutMinutePriority outMinutePriority { get; set; }
+
+
+ /// <summary>
+ /// NDC鍦板潃
+ /// </summary>
public static string NDCApiUrl { get; set; }
@@ -86,7 +107,16 @@
{
EmptyPalletBufferArea = keyValue.Value.ToString();
}
-
+
+ //hosttoagv閴存潈
+ //if (keyValue.Name == "AppKey")
+ //{
+ // AppKey = keyValue.Value.ToString();
+ //}
+ //if (keyValue.Name == "AppSecret")
+ //{
+ // AppSecret = keyValue.Value.ToString();
+ //}
if (keyValue.Name == "SafetyLocation")
{
@@ -97,6 +127,11 @@
{
TmDeviceInfos = JsonConvert.DeserializeObject<List<TmDeviceInfo>>(keyValue.Value.ToString());
}
+
+ //if (keyValue.Name == "OutMinutePriority")
+ //{
+ // outMinutePriority = JsonConvert.DeserializeObject<OutMinutePriority> (keyValue.Value.ToString());
+ //}
//if (keyValue.Name == "DeviceInfo")
//{
// deviceInfos = JsonConvert.DeserializeObject<List<deviceInfo>>(keyValue.Value.ToString());
@@ -116,6 +151,19 @@
}
+
+ // "OutMinutePriority": {
+ // "Minute": 10,
+ // "Priority": 1
+ //},
+
+
+ public class OutMinutePriority
+ {
+ public int Minute { get; set; }
+ public int Priority { get; set; }
+ }
+
public class TmDeviceInfo
{
public string deviceName { get; set; }
--
Gitblit v1.9.1