From 5321419f5fddb4e877fe90ccd90ebdc1a115af64 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 18 七月 2025 17:29:26 +0800
Subject: [PATCH] 出库修改
---
util/Settings.cs | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index 5124c87..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>
/// 绌烘墭缂撳瓨鍖�@@ -32,17 +41,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; }
- public static OutMinutePriority outMinutePriority { get; set; }
+ /// <summary>
+ /// 浼樺厛绾ч厤缃�+ /// </summary>
+ //public static OutMinutePriority outMinutePriority { get; set; }
-
-
+
+
+ /// <summary>
+ /// NDC鍦板潃
+ /// </summary>
public static string NDCApiUrl { get; set; }
@@ -66,7 +86,11 @@
{
WcsApiAddres = keyValue.Value.ToString();
}
-
+ if (keyValue.Name == "MesApiAddres")
+ {
+ MesApiAddres = keyValue.Value.ToString();
+ }
+
if (keyValue.Name == "MesGetItemApi")
{
MesGetItemApi = keyValue.Value.ToString();
@@ -89,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")
{
@@ -101,10 +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