From 0ed390381862dea0c7fd0210d16017eb09f12da4 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 30 七月 2025 17:27:27 +0800
Subject: [PATCH] 封装插入容器表等业务代码, 修复部分底层旧框架方法问题
---
util/Settings.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/util/Settings.cs b/util/Settings.cs
index 946c47c..b9eb8a7 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -7,9 +7,8 @@
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
@@ -17,7 +16,8 @@
public static int TcpServerPort { get; set; }
public static Config.ErpRoute ErpRoute { get; set; }
- public static string SqlServer { 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>();
@@ -48,7 +48,7 @@
ErpApiUrl = root.ErpApiUrl;
ErpRoute = root.ErpRoute;
TcpServerPort= root.TcpServerPort;
- SqlServer = root.SqlServer;
+ DbConn = root.SqlServer;
//TcpServerIp = root.TcpServerIp;
//TcpServerPort = root.TcpServerPort;
ProductionLines = root.ProductionLines;
@@ -147,5 +147,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