From bb09e7affb602791af4064cda8cddcfae8b3f3aa Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 22 五月 2025 13:17:46 +0800
Subject: [PATCH] 内部联调测试，修复产品入库货区判断逻辑等问题
---
util/Settings.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index 7717084..20b169b 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -17,21 +17,22 @@
public static string SqlServer { get; set; }
public static string TCPServerIP { get; set; }
public static int TCPServerPort { get; set; }
- public static List<Config.Area> Areas { get; set; }
+ //public static List<Config.Area> Areas { get; set; }
+ public static List<List<string>> Areas { get; set; } = new List<List<string>>();
public static List<Config.Snap> Snaps { get; set; }
public static string CaptureUrl { get; set; }
/// <summary>
/// 搴撳尯瀛楀吀锛堝姞杞藉悗灏变笉鍙橈級
/// </summary>
- public static Dictionary<string, List<string>> AreaMap { get; set; } = new Dictionary<string, List<string>>();
+ //public static Dictionary<string, List<string>> AreaMap { get; set; } = new Dictionary<string, List<string>>();
public static void Init() {
// 鍔犺浇閰嶇疆鏂囦欢
LoadJson();
// 閽堝 Areas 杩涜杞崲锛氬皢 Config 鐨�List 鍔犺浇鍒�Dict 涓�- LoadAreas();
+ //LoadAreas();
}
private static void LoadJson() {
@@ -52,7 +53,10 @@
SqlServer = root.SqlServer;
TCPServerIP = root.TCPServerIP;
TCPServerPort = root.TCPServerPort;
- Areas = root.Areas;
+ //Areas = root.Areas;
+ foreach (var item in root.Areas) {
+ Areas.Add(item.Codes);
+ }
Snaps = root.Snaps;
CaptureUrl = root.CaptureUrl;
@@ -70,9 +74,9 @@
}
private static void LoadAreas() {
- foreach (var area in Areas) {
- AreaMap.Add(area.Name, area.Codes);
- }
+ //foreach (var area in Areas) {
+ // AreaMap.Add(area.Name, area.Codes);
+ //}
}
}
--
Gitblit v1.9.1