From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
util/Settings.cs | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index 9a653c9..a27282b 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -7,15 +7,19 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-namespace HH.WCS.Mobox3.DSZSH {
- public class Settings
- {
+namespace HH.WCS.Mobox3.DSZSH.util {
+ public class Settings {
public static string WebApiUrl { get; set; }
public static string NdcApiUrl { get; set; }
public static string ErpApiUrl { get; set; } // ERP 鍙嶉鎺ュ彛URL
- public static string SqlServer { get; set; }
- public static string TcpServerIp { get; set; }
+
public static int TcpServerPort { get; set; }
+ public static Config.ErpRoute ErpRoute { get; set; }
+
+ public static SqlSugar.DbType DbType { get; set; } = SqlSugar.DbType.SqlServer;
+ public static string DbConn { get; set; }
+ //public static string TcpServerIp { get; set; }
+ //public static int TcpServerPort { get; set; }
public static List<Config.ProductionLine> ProductionLines { get; set; } = new List<Config.ProductionLine>();
public static List<Config.TaskInfo> TaskInfos { get; set; } = new List<Config.TaskInfo> { };
@@ -25,10 +29,12 @@
public static void Init() {
// 鍔犺浇閰嶇疆鏂囦欢
LoadJson();
+
+ LoadProdLines();
}
private static void LoadJson() {
- LogHelper.Info("鍔犺浇閰嶇疆鏂囦欢淇℃伅 寮�");
+ LogHelper.Info("鍔犺浇閰嶇疆鏂囦欢淇℃伅:寮�!!");
// JSON 鏂囦欢璺緞
string filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "./config/config.json");
@@ -39,54 +45,53 @@
// 鍙嶅簭鍒楀寲涓�Config 瀵硅薄
var root = JsonConvert.DeserializeObject<Config.Root>(jsonContent);
+ #region Config.Root 璧嬪�瀛楁閮ㄥ垎
WebApiUrl = root.WebApiUrl;
NdcApiUrl = root.NdcApiUrl;
ErpApiUrl = root.ErpApiUrl;
- SqlServer = root.SqlServer;
- TcpServerIp = root.TcpServerIp;
+ ErpRoute = root.ErpRoute;
TcpServerPort = root.TcpServerPort;
+ DbConn = root.SqlServer;
+ //TcpServerIp = root.TcpServerIp;
+ //TcpServerPort = root.TcpServerPort;
ProductionLines = root.ProductionLines;
TaskInfos = root.TaskInfos;
-
- for (var i = 0; i < ProductionLines.Count; i++) {
- foreach (var onLoc in ProductionLines[i].OnLoc) {
- LocProdIdMap.Add(onLoc, int.Parse(ProductionLines[i].Id));
- }
- foreach (var offLoc in ProductionLines[i].OffLoc) {
- LocProdIdMap.Add(offLoc, int.Parse(ProductionLines[i].Id));
- }
- }
+ #endregion
}
catch (FileNotFoundException) {
- LogHelper.Info("JSON 鏂囦欢鏈壘鍒�);
+ LogHelper.Info("JSON鏂囦欢鏈壘鍒�!", "Exception");
}
catch (JsonException ex) {
- LogHelper.Info($"JSON 瑙ｆ瀽閿欒: {ex.Message}");
+ LogHelper.Info($"JSON瑙ｆ瀽閿欒!!Error:{ex.Message}\n\n{ex.StackTrace}\n", "Exception");
}
catch (Exception ex) {
- LogHelper.Info($"鍙戠敓閿欒: {ex.Message}");
+ LogHelper.InfoEx(ex, "Settings:");
}
- LogHelper.Info("鍔犺浇閰嶇疆鏂囦欢淇℃伅 瀹屾垚");
+ LogHelper.Info("鍔犺浇閰嶇疆鏂囦欢淇℃伅:瀹屾垚!!");
}
private static void LoadProdLines() {
- //var db = new SqlHelper<object>().GetInstance();
- //for (int i = 0; i < ProductionLines.Count; i++) {
- // var line = ProductionLines[i];
- // // 閫氳繃OnLoc OffLoc鎵惧埌AGVsite鐒跺悗鍐欏叆瀛楀吀
- //}
- }
-
- public static Config.TaskInfo GetTaskInfo(ETask eTask) {
- return TaskInfos[(int)eTask];
+ for (var i = 0; i < ProductionLines.Count; i++) {
+ if (ProductionLines[i].OnLoc == null) continue;
+ foreach (var onLoc in ProductionLines[i].OnLoc) {
+ LocProdIdMap.Add(onLoc, int.Parse(ProductionLines[i].Id));
+ }
+ foreach (var offLoc in ProductionLines[i].OffLoc) {
+ LocProdIdMap.Add(offLoc, int.Parse(ProductionLines[i].Id));
+ }
+ }
}
}
// [Convert JSON to C# Classes Online - Json2CSharp Toolkit](https://json2csharp.com/)
public class Config {
-
// Root myDeserializedClass = JsonConvert.DeserializeObject<Root>(myJsonResponse);
+ public class ErpRoute {
+ public string CreateTaskReturn { get; set; }
+ public string PickUpReturn { get; set; }
+ }
+
public class ProductionLine {
public string Id { get; set; }
public string Name { get; set; }
@@ -101,9 +106,9 @@
public string WebApiUrl { get; set; }
public string NdcApiUrl { get; set; }
public string ErpApiUrl { get; set; }
- public string SqlServer { get; set; }
- public string TcpServerIp { get; set; }
public int TcpServerPort { get; set; }
+ public ErpRoute ErpRoute { get; set; }
+ public string SqlServer { get; set; }
public List<TaskInfo> TaskInfos { get; set; }
public List<ProductionLine> ProductionLines { get; set; }
}
@@ -136,5 +141,17 @@
public static string Name(this ETask eTask) {
return Settings.TaskInfos[(int)eTask].TaskName;
}
+
+ public static Config.TaskInfo Info(this ETask eTask) {
+ return Settings.TaskInfos[(int)eTask];
+ }
+
+ public static List<string> StartAreas(this ETask eTask) {
+ return Settings.TaskInfos[(int)(eTask)].StartAreas;
+ }
+
+ public static List<string> EndAreas(this ETask eTask) {
+ return Settings.TaskInfos[((int)eTask)].EndAreas;
+ }
}
}
--
Gitblit v1.9.1