From 46dc31d4e66e45cde693b9c909691a710fabfcee Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 10 七月 2025 17:31:14 +0800
Subject: [PATCH] mes接口修改
---
util/Settings.cs | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index d04e6d1..0260dcb 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -17,10 +17,19 @@
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; }
public static string WcsApiAddres { get; set; }
+
+ public static string MesApiAddres { get; set; }
/// <summary>
/// 绌烘墭缂撳瓨鍖�@@ -47,7 +56,7 @@
/// <summary>
/// 浼樺厛绾ч厤缃� /// </summary>
- public static OutMinutePriority outMinutePriority { get; set; }
+ //public static OutMinutePriority outMinutePriority { get; set; }
@@ -77,7 +86,11 @@
{
WcsApiAddres = keyValue.Value.ToString();
}
-
+ if (keyValue.Name == "MesApiAddres")
+ {
+ MesApiAddres = keyValue.Value.ToString();
+ }
+
if (keyValue.Name == "MesGetItemApi")
{
MesGetItemApi = keyValue.Value.ToString();
@@ -100,7 +113,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")
{
@@ -112,14 +134,10 @@
TmDeviceInfos = JsonConvert.DeserializeObject<List<TmDeviceInfo>>(keyValue.Value.ToString());
}
- if (keyValue.Name == "OutMinutePriority")
- {
- outMinutePriority = JsonConvert.DeserializeObject<OutMinutePriority> (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());
--
Gitblit v1.9.1