From 59dc2aa6e3fe7f699c4f2d03b774763142c5698d Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期六, 05 七月 2025 17:31:54 +0800
Subject: [PATCH] 添加货位容器关系表锁、调整货架行号和记录表同步逻辑
---
util/Settings.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index 7717084..796fe32 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.Snap> Snaps { 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; } = new List<Config.Snap>();
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() {
@@ -48,11 +49,14 @@
WebApiUrl = root.WebApiUrl;
RCSApiUrl = root.RCSApiUrl;
- NDCApiUrl = root.NDCApiUrl;
+ //NDCApiUrl = root.NDCApiUrl;
SqlServer = root.SqlServer;
- TCPServerIP = root.TCPServerIP;
- TCPServerPort = root.TCPServerPort;
- Areas = root.Areas;
+ //TCPServerIP = root.TCPServerIP;
+ //TCPServerPort = root.TCPServerPort;
+ //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);
+ //}
}
}
@@ -86,10 +90,7 @@
public class Root {
public string WebApiUrl { get; set; }
public string RCSApiUrl { get; set; }
- public string NDCApiUrl { get; set; }
public string SqlServer { get; set; }
- public string TCPServerIP { get; set; }
- public int TCPServerPort { get; set; }
public List<Area> Areas { get; set; }
public List<Snap> Snaps { get; set; }
public string CaptureUrl { get; set; }
@@ -101,13 +102,19 @@
public string Name { get; set; }
public string Pwd { get; set; }
}
+
+
}
public class TaskName {
public const string 浜у搧鍏ュ簱 = "浜у搧鍏ュ簱";
public const string 浜у搧閮ㄥ垎鍑哄簱 = "浜у搧閮ㄥ垎鍑哄簱";
public const string 浜у搧閮ㄥ垎鍥炲簱 = "浜у搧閮ㄥ垎鍥炲簱";
- public const string 鐩樼偣鐞嗚揣鍑哄簱 = "鐩樼偣鐞嗚揣鍑哄簱";
- public const string 鐩樼偣鐞嗚揣鍥炲簱 = "鐩樼偣鐞嗚揣鍥炲簱";
+ }
+
+ public class AreaIndex {
+ public const int Q鍙栬揣鍖�= 0;
+ public const int X鍗歌揣鍖�= 1;
+ public const int H璐ф灦鍖�= 2;
}
}
--
Gitblit v1.9.1