diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo
index a9c29bda..059e2573 100644
Binary files a/.vs/HighWayIot/v16/.suo and b/.vs/HighWayIot/v16/.suo differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll
index 62429178..651e0b9c 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb
index c6fd92a9..3acb35ed 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
index 3b25af4c..7466da45 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt
index 16f6cad4..51a58478 100644
--- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt
+++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt
@@ -70,23 +70,6 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\Inve
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb
@@ -124,6 +107,23 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveChar
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.baml
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml
diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll
index 23bdb81e..3f3a8a6e 100644
Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb
index 83e7f68f..8e21ccda 100644
Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index 84a2e8bf..c977cb4e 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll
index 23bdb81e..3f3a8a6e 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb
index 83e7f68f..8e21ccda 100644
Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
index a2b06adf..b7d5aeba 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Log4net/LogHelper.cs b/HighWayIot.Log4net/LogHelper.cs
index 5a74e1f6..88b1f4d4 100644
--- a/HighWayIot.Log4net/LogHelper.cs
+++ b/HighWayIot.Log4net/LogHelper.cs
@@ -32,7 +32,7 @@ namespace HighWayIot.Log4net
*
*/
//private readonly string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log4net.config");
- private readonly string fileName = "Z:\\Desktop\\日常代码\\HighWayIot\\HighWayIot.Log4net\\config\\log4net.config";
+ private readonly string fileName = "C:\\项目代码\\澳柯玛MES项目\\Aucma.Scada\\HighWayIot.Log4net\\config\\log4net.config";
private LogHelper()
{
diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll
index 23bdb81e..3f3a8a6e 100644
Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb
index 83e7f68f..8e21ccda 100644
Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
index 1043c63e..6dcc511a 100644
--- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
@@ -23,8 +23,8 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighW
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll
index 23bdb81e..3f3a8a6e 100644
Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb
index 83e7f68f..8e21ccda 100644
Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache
index 0e2fa18d..812cb751 100644
Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
index 9a408b33..8d1557d7 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj
index e055e2cf..46667a55 100644
--- a/HighWayIot.Repository/HighWayIot.Repository.csproj
+++ b/HighWayIot.Repository/HighWayIot.Repository.csproj
@@ -69,6 +69,7 @@
+
@@ -78,6 +79,10 @@
{89a1edd9-d79e-468d-b6d3-7d07b8843562}
HighWayIot.Common
+
+ {75180EE5-13AE-499B-B0F6-C7BFEE1140CC}
+ HighWayIot.Config
+
{deabc30c-ec6f-472e-bd67-d65702fdaf74}
HighWayIot.Log4net
diff --git a/HighWayIot.Repository/SqlSugarHelper.cs b/HighWayIot.Repository/SqlSugarHelper.cs
index 15242670..85994173 100644
--- a/HighWayIot.Repository/SqlSugarHelper.cs
+++ b/HighWayIot.Repository/SqlSugarHelper.cs
@@ -1,4 +1,5 @@
using HighWayIot.Common;
+using HighWayIot.Config;
using HighWayIot.Log4net;
using SqlSugar;
using System;
@@ -16,6 +17,8 @@ namespace HighWayIot.Repository
private static JsonChange jsonChange = JsonChange.Instance;
+ private static AppConfig appConfig = AppConfig.Instance;
+
#region 连接字符串
/**
* Sqlite:获取debug路径下的数据库文件，不建议直接写死路径
@@ -39,24 +42,16 @@ namespace HighWayIot.Repository
{
new ConnectionConfig()
{
- ConfigId = "sqlite",
- ConnectionString = sqliteConnStr,
- DbType = DbType.Sqlite,
- InitKeyType = InitKeyType.Attribute,
- IsAutoCloseConnection = true
- },
- new ConnectionConfig()
- {
- ConfigId = "mysql",
- ConnectionString = mysqlConnStr,
- DbType = DbType.MySql,
+ ConfigId = "mes",
+ ConnectionString = appConfig.mesConnStr,
+ DbType = DbType.Oracle,
InitKeyType = InitKeyType.Attribute,
IsAutoCloseConnection = true
},
new ConnectionConfig()
{
- ConfigId = "aucma_mes",
- ConnectionString = oracleConnStr,
+ ConfigId = "scada",
+ ConnectionString = appConfig.scadaConnStr,
DbType = DbType.Oracle,
InitKeyType = InitKeyType.Attribute,
IsAutoCloseConnection = true
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll
new file mode 100644
index 00000000..95156774
Binary files /dev/null and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb
new file mode 100644
index 00000000..d07816a8
Binary files /dev/null and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll
index 23bdb81e..3f3a8a6e 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb
index 83e7f68f..8e21ccda 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
index 62429178..52660f13 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
index c6fd92a9..d62bfc1b 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/domain/BaseSpaceInfo.cs b/HighWayIot.Repository/domain/BaseSpaceInfo.cs
index d73ed932..3e722d64 100644
--- a/HighWayIot.Repository/domain/BaseSpaceInfo.cs
+++ b/HighWayIot.Repository/domain/BaseSpaceInfo.cs
@@ -10,13 +10,13 @@ namespace HighWayIot.Repository.domain
///
/// 货道信息
///
- [SugarTable("BASE_BOMINFO")]
+ [SugarTable("BASE_SPACEINFO")]
public class BaseSpaceInfo
{
///
/// 主键标识
///
- [SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true)]
+ [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int objId { get; set; }
///
diff --git a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 3d0d7968..793dee9b 100644
Binary files a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index 4284414c..760f0a87 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
index 5a22c56e..58962f35 100644
--- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-6d12713f7cd51d331b66a693a4ff6bceb357e85d
+cd309b8333415f420709774c635be812b73b5a82
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt
index 44cee5bd..f9b79227 100644
--- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt
+++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt
@@ -42,19 +42,24 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\Hi
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.AssemblyReference.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CoreCompileInputs.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll.config
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Config.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\Oracle.ManagedDataAccess.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\log4net.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Config.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CoreCompileInputs.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\MySql.Data.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\SqlSugar.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\System.Data.SQLite.dll
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
index 62429178..52660f13 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
index c6fd92a9..d62bfc1b 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/service/IBaseSpaceInfoService.cs b/HighWayIot.Repository/service/IBaseSpaceInfoService.cs
index c1b3f17a..e00111ad 100644
--- a/HighWayIot.Repository/service/IBaseSpaceInfoService.cs
+++ b/HighWayIot.Repository/service/IBaseSpaceInfoService.cs
@@ -15,9 +15,10 @@ namespace HighWayIot.Repository.service
///
/// 通过物料类型获取指定货道，如果没有对应类型的货道返回空白类型的货道
///
+ ///
///
///
- List GetSpaceInfoByMaterialType(string materialType);
+ BaseSpaceInfo GetSpaceInfoByMaterialType(string store, string materialType);
///
/// 更新货道信息
diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs
index 226628b9..e36dd448 100644
--- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs
+++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs
@@ -1,5 +1,4 @@
using HighWayIot.Common;
-using HighWayIot.Config;
using HighWayIot.Log4net;
using HighWayIot.Repository.domain;
using System;
@@ -11,31 +10,43 @@ using System.Threading.Tasks;
namespace HighWayIot.Repository.service.Impl
{
- class BaseSpaceInfoServiceImpl : IBaseSpaceInfoService
+ public class BaseSpaceInfoServiceImpl : IBaseSpaceInfoService
{
- private LogHelper log = LogHelper.Instance;
+ private Repository _mesRepository = new Repository("mes");
- Repository _mesRepository => new Repository("mes");
+ private LogHelper logHelper = LogHelper.Instance;
+
+ private JsonChange jsonChange = JsonChange.Instance;
///
- /// 根据物料类型获取货道信息
+ /// 通过物料类型获取指定货道，如果没有对应类型的货道返回空白类型的货道
///
///
///
///
- public List GetSpaceInfoByMaterialType(string store,string materialType)
+ public BaseSpaceInfo GetSpaceInfoByMaterialType(string store, string materialType)
{
- List < BaseSpaceInfo > spaceInfos = null;
+ BaseSpaceInfo spaceInfo = null;
+ List spaceInfos;
try
{
Expression> exp = s1 => true;
- exp = exp.And(x => x.materialType == materialType && x.storeCode == store);
+ exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceCapacity != x.spaceStock); //相同型号、启用状态、库存未满的货道信息
spaceInfos = _mesRepository.GetList(exp);
- }catch(Exception ex)
+
+ if(spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配
+ {
+ spaceInfos = GetEmptySpaceInfo();
+ }
+ logHelper.Info($"根据仓库{store}；物料：{materialType}；获取到的货道信息：{jsonChange.ModeToJson(spaceInfos)}");
+ spaceInfo = inStoreFilter(spaceInfos);
+ logHelper.Info($"仓库{store}；物料：{materialType}；匹配的入库货道信息：{jsonChange.ModeToJson(spaceInfo)}");
+ }
+ catch(Exception ex)
{
- log.Error("根据物料类型获取货道信息异常", ex);
+ logHelper.Error("通过物料类型获取货道信息异常",ex);
}
- return spaceInfos;
+ return spaceInfo;
}
///
@@ -51,27 +62,63 @@ namespace HighWayIot.Repository.service.Impl
result = _mesRepository.Update(spaceInfo);
}catch(Exception ex)
{
- log.Error("更新货道信息异常", ex);
+ logHelper.Error("更新货道信息异常", ex);
}
return result;
}
///
- /// 入库过滤
+ /// 入库过滤逻辑
///
///
- private void InStoreFilter(List spaceInfos)
+ private BaseSpaceInfo inStoreFilter(List spaceInfos)
{
+ BaseSpaceInfo spaceInfo = null;
+ if(spaceInfos != null)
+ {
+ //spaceInfos = spaceInfos.Where(x => x.spaceCapacity != x.spaceStock).ToList(); //获取库存未满的货道
+ //if(spaceInfos != null)
+ //{
+ // spaceInfo = spaceInfos.OrderByDescending(x => x.spaceStock).First(); //获取库存最多的货道
+ //}
+ //获取库存未满库存最多的货道
+ spaceInfo = spaceInfos.Where(x => x.spaceCapacity != x.spaceStock).OrderByDescending(x => x.spaceStock).First();
+ }
+ else
+ {
+ logHelper.Info("未获取到匹配的货道信息");
+ }
+
+ return spaceInfo;
}
///
- /// 出库过滤
+ /// 出库过滤逻辑
///
///
- private void OutStoreFilter(List spaceInfos)
+ private void outStoreFilter(List spaceInfos)
{
}
+
+ ///
+ /// 获取空货道：未分配物料型号的空白货道
+ ///
+ ///
+ private List GetEmptySpaceInfo()
+ {
+ List spaceInfos = null;
+ try
+ {
+ Expression> exp = s1 => true;
+ exp = exp.And(x => x.materialType == null && x.spaceCapacity != x.spaceStock);
+ spaceInfos = _mesRepository.GetList(exp);
+ }catch(Exception ex)
+ {
+ logHelper.Error("获取空货道异常", ex);
+ }
+ return spaceInfos;
+ }
}
-}
+}
\ No newline at end of file
diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
index 8aeabda4..91ea190e 100644
Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache
new file mode 100644
index 00000000..4c6cbc6c
Binary files /dev/null and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt
index a03956d1..ca1d24a5 100644
--- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt
+++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt
@@ -24,6 +24,7 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\H
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll
diff --git a/HighWayIot/Program.cs b/HighWayIot/Program.cs
index 4ce86073..54866ecf 100644
--- a/HighWayIot/Program.cs
+++ b/HighWayIot/Program.cs
@@ -17,14 +17,12 @@ namespace HighWayIot
private static IBaseBomInfoService oracleTest = new BaseBomInfoServiceImpl();
+ private static readonly IBaseSpaceInfoService spaceInfoService = new BaseSpaceInfoServiceImpl();
+
static void Main(string[] args)
{
logger.Info("初始化启动");
-
-
- var info2 = mysqlTest.GetUserInfos();
-
- var info3 = oracleTest.GetBomInfos();
+ var info = spaceInfoService.GetSpaceInfoByMaterialType("X-001", "SC232");
}
}
}
diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.dll b/HighWayIot/bin/Debug/HighWayIot.Config.dll
new file mode 100644
index 00000000..95156774
Binary files /dev/null and b/HighWayIot/bin/Debug/HighWayIot.Config.dll differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.pdb b/HighWayIot/bin/Debug/HighWayIot.Config.pdb
new file mode 100644
index 00000000..d07816a8
Binary files /dev/null and b/HighWayIot/bin/Debug/HighWayIot.Config.pdb differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll
index 23bdb81e..3f3a8a6e 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb
index 83e7f68f..8e21ccda 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll
index 62429178..52660f13 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb
index c6fd92a9..d62bfc1b 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.exe b/HighWayIot/bin/Debug/HighWayIot.exe
index 9f01a137..480fd38b 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.exe and b/HighWayIot/bin/Debug/HighWayIot.exe differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.pdb b/HighWayIot/bin/Debug/HighWayIot.pdb
index 88f3eedd..3f97e520 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.pdb and b/HighWayIot/bin/Debug/HighWayIot.pdb differ
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/LogInfo.txt b/HighWayIot/bin/Debug/Log/2023-07-20/LogInfo.txt
deleted file mode 100644
index 0c15dc4d..00000000
--- a/HighWayIot/bin/Debug/Log/2023-07-20/LogInfo.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-<-------------->
-־ʱ䣺2023-07-20 17:06:52,854 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 17:23:28,306 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 17:24:59,998 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 17:27:26,453 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 17:29:32,273 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 17:30:10,132 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 17:31:17,929 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:29:12,988 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:38:49,381 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:42:11,112 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:42:51,859 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:44:17,587 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:44:34,680 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:44:58,344 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:45:27,929 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 19:46:00,093 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:06:42,146 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:07:59,372 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:08:32,583 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:09:29,787 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:10:12,650 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:12:07,504 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:13:19,543 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:17:51,956 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:18:54,590 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:19:42,325 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:22:26,290 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:23:45,448 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:26:20,168 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:27:00,096 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:27:34,718 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:35:15,944 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-07-20 20:35:59,806 [1]
-־INFO
-־ݣʼ
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/SqlLog.txt b/HighWayIot/bin/Debug/Log/2023-07-20/SqlLog.txt
deleted file mode 100644
index dafd6f06..00000000
--- a/HighWayIot/bin/Debug/Log/2023-07-20/SqlLog.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-<-------------->
-־ʱ䣺2023-07-20 17:23:31,766 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 17:25:02,777 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 17:27:29,463 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 17:29:35,873 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 17:31:21,695 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 19:29:17,092 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 19:38:53,588 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 19:42:14,274 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 19:44:21,779 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 19:45:01,932 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:06:45,987 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:08:05,528 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:08:35,877 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:09:31,041 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:10:13,764 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:12:08,672 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:13:20,678 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:17:53,056 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:18:55,737 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:19:43,539 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:22:27,483 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:23:46,624 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:26:21,363 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:27:01,271 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:27:35,905 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:35:17,165 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-07-20 20:36:01,067 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/LogError.html b/HighWayIot/bin/Debug/Log/2023-09-16/LogError.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/LogInfo.txt b/HighWayIot/bin/Debug/Log/2023-09-16/LogInfo.txt
deleted file mode 100644
index 9ff87493..00000000
--- a/HighWayIot/bin/Debug/Log/2023-09-16/LogInfo.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<-------------->
-־ʱ䣺2023-09-16 13:29:29,525 [1]
-־INFO
-־ݣʼ
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/PlcLog.txt b/HighWayIot/bin/Debug/Log/2023-09-16/PlcLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/RfidLog.txt b/HighWayIot/bin/Debug/Log/2023-09-16/RfidLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/SemaphoreLog.txt b/HighWayIot/bin/Debug/Log/2023-09-16/SemaphoreLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/SqlLog.txt b/HighWayIot/bin/Debug/Log/2023-09-16/SqlLog.txt
deleted file mode 100644
index 9867032d..00000000
--- a/HighWayIot/bin/Debug/Log/2023-09-16/SqlLog.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<-------------->
-־ʱ䣺2023-09-16 13:30:09,450 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-16/ViewLog.txt b/HighWayIot/bin/Debug/Log/2023-09-16/ViewLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/LogError.html b/HighWayIot/bin/Debug/Log/2023-09-18/LogError.html
deleted file mode 100644
index a967dd9b..00000000
--- a/HighWayIot/bin/Debug/Log/2023-09-18/LogError.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-쳣ʱ䣺2023-09-18 09:28:13,297 [1]
-쳣ERROR
- ࣺlogerror [(null)]
-Ϣ : ȡBOM쳣
쳣͡Exception
쳣Ϣʾ : ҪManagedDataAccess.dll δװ߰汾ͻ 沽 1NugetжĿManagedDataAccess.dllSqlSugarNuget°װ,ϲ WBE NUGETװϸ̳̣https://www.donet5.com/Doc/8/1154
English Message : You need to refer to Oracle.ManagedDataAccess.dll
ջá at SqlSugar.DependencyManagement.TryOracle()
at SqlSugar.SqlSugarProvider.CheckDbDependency(ConnectionConfig config)
at SqlSugar.SqlSugarProvider..ctor(ConnectionConfig config)
at SqlSugar.SqlSugarClient.GetConnection(Object configId)
at SqlSugar.SqlSugarClient.GetConnectionScope(Object configId)
at SqlSugar.SqlSugarScope.GetConnectionScope(Object configId)
at System.Dynamic.UpdateDelegates.UpdateAndExecute2[T0,T1,TRet](CallSite site, T0 arg0, T1 arg1)
at HighWayIot.Repository.Repository`1..ctor(Object configId) in \\Mac\Home\Desktop\ճ\HighWayIot\HighWayIot.Repository\Repository.cs:line 18
at HighWayIot.Repository.service.Impl.BaseBomInfoServiceImpl.get__bomInfoRepository() in \\Mac\Home\Desktop\ճ\HighWayIot\HighWayIot.Repository\service\Impl\BaseBomInfoServiceImpl.cs:line 13
at HighWayIot.Repository.service.Impl.BaseBomInfoServiceImpl.GetBomInfos() in \\Mac\Home\Desktop\ճ\HighWayIot\HighWayIot.Repository\service\Impl\BaseBomInfoServiceImpl.cs:line 21
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/LogInfo.txt b/HighWayIot/bin/Debug/Log/2023-09-18/LogInfo.txt
deleted file mode 100644
index 6da828f1..00000000
--- a/HighWayIot/bin/Debug/Log/2023-09-18/LogInfo.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-<-------------->
-־ʱ䣺2023-09-18 09:27:40,038 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-09-18 09:28:58,148 [1]
-־INFO
-־ݣʼ
- <-------------->
-־ʱ䣺2023-09-18 09:30:59,210 [1]
-־INFO
-־ݣʼ
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/PlcLog.txt b/HighWayIot/bin/Debug/Log/2023-09-18/PlcLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/RfidLog.txt b/HighWayIot/bin/Debug/Log/2023-09-18/RfidLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/SemaphoreLog.txt b/HighWayIot/bin/Debug/Log/2023-09-18/SemaphoreLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/SqlLog.txt b/HighWayIot/bin/Debug/Log/2023-09-18/SqlLog.txt
deleted file mode 100644
index aa29cc5d..00000000
--- a/HighWayIot/bin/Debug/Log/2023-09-18/SqlLog.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-<-------------->
-־ʱ䣺2023-09-18 09:27:48,644 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-09-18 09:29:01,498 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
- <-------------->
-־ʱ䣺2023-09-18 09:31:02,413 [1]
-־INFO
-־ݣSELECT `objId`,`process_Id`,`position_Id`,`device_Id`,`device_Name`,`device_Ip`,`device_Port`,`device_Ant`,`device_Type` FROM `base_deviceInfo` WHERE ( `process_Id` = @ProcessId0 ) [{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":"@ProcessId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
-
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-18/ViewLog.txt b/HighWayIot/bin/Debug/Log/2023-09-18/ViewLog.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/LogError.html b/HighWayIot/bin/Debug/Log/2023-09-27/LogError.html
similarity index 100%
rename from HighWayIot/bin/Debug/Log/2023-07-20/LogError.html
rename to HighWayIot/bin/Debug/Log/2023-09-27/LogError.html
diff --git a/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt b/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt
new file mode 100644
index 00000000..4a6258e3
--- /dev/null
+++ b/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt
@@ -0,0 +1,17 @@
+<-------------->
+־ʱ䣺2023-09-27 10:37:20,549 [1]
+־INFO
+־ݣʼ
+ <-------------->
+־ʱ䣺2023-09-27 10:42:47,815 [1]
+־INFO
+־ݣʼ
+ <-------------->
+־ʱ䣺2023-09-27 10:42:50,572 [1]
+־INFO
+־ݣݲֿX-001ϣSC232ȡĻϢ[{"objId":2,"spaceCode":"HD_002","spaceName":"02","spaceCapacity":10,"spaceStock":1,"spaceStatus":1,"spaceType":1,"materialType":null,"storeCode":"X-001","isFlag":0}]
+ <-------------->
+־ʱ䣺2023-09-27 10:42:50,576 [1]
+־INFO
+־ݣֿX-001ϣSC232ƥϢ{"objId":2,"spaceCode":"HD_002","spaceName":"02","spaceCapacity":10,"spaceStock":1,"spaceStatus":1,"spaceType":1,"materialType":null,"storeCode":"X-001","isFlag":0}
+
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/PlcLog.txt b/HighWayIot/bin/Debug/Log/2023-09-27/PlcLog.txt
similarity index 100%
rename from HighWayIot/bin/Debug/Log/2023-07-20/PlcLog.txt
rename to HighWayIot/bin/Debug/Log/2023-09-27/PlcLog.txt
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/RfidLog.txt b/HighWayIot/bin/Debug/Log/2023-09-27/RfidLog.txt
similarity index 100%
rename from HighWayIot/bin/Debug/Log/2023-07-20/RfidLog.txt
rename to HighWayIot/bin/Debug/Log/2023-09-27/RfidLog.txt
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/SemaphoreLog.txt b/HighWayIot/bin/Debug/Log/2023-09-27/SemaphoreLog.txt
similarity index 100%
rename from HighWayIot/bin/Debug/Log/2023-07-20/SemaphoreLog.txt
rename to HighWayIot/bin/Debug/Log/2023-09-27/SemaphoreLog.txt
diff --git a/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt b/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt
new file mode 100644
index 00000000..05f21c73
--- /dev/null
+++ b/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt
@@ -0,0 +1,17 @@
+<-------------->
+־ʱ䣺2023-09-27 10:37:21,960 [1]
+־INFO
+־ݣSELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO" WHERE (( 1 = 1 ) AND(((( "STORE_CODE" = :storeCode1 ) AND ( "MATERIAL_TYPE" = :materialType2 )) AND ( "SPACE_STATUS" = :spaceStatus3 )) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" )))[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"X-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":materialType2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"SC232","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":spaceStatus3","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
+ <-------------->
+־ʱ䣺2023-09-27 10:37:24,245 [1]
+־INFO
+־ݣSELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO" WHERE (( 1 = 1 ) AND(( "MATERIAL_TYPE" IS NULL ) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" )))[]
+ <-------------->
+־ʱ䣺2023-09-27 10:42:48,814 [1]
+־INFO
+־ݣSELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO" WHERE (( 1 = 1 ) AND(((( "STORE_CODE" = :storeCode1 ) AND ( "MATERIAL_TYPE" = :materialType2 )) AND ( "SPACE_STATUS" = :spaceStatus3 )) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" )))[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"X-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":materialType2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"SC232","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":spaceStatus3","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
+ <-------------->
+־ʱ䣺2023-09-27 10:42:50,459 [1]
+־INFO
+־ݣSELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO" WHERE (( 1 = 1 ) AND(( "MATERIAL_TYPE" IS NULL ) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" )))[]
+
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-07-20/ViewLog.txt b/HighWayIot/bin/Debug/Log/2023-09-27/ViewLog.txt
similarity index 100%
rename from HighWayIot/bin/Debug/Log/2023-07-20/ViewLog.txt
rename to HighWayIot/bin/Debug/Log/2023-09-27/ViewLog.txt
diff --git a/HighWayIot/bin/Debug/config/App.Ini b/HighWayIot/bin/Debug/config/App.Ini
new file mode 100644
index 00000000..3720bf86
--- /dev/null
+++ b/HighWayIot/bin/Debug/config/App.Ini
@@ -0,0 +1,3 @@
+[system]
+mesConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma
+scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index 9c618be7..693bfebf 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache
index c6cfa5f1..8a3fc845 100644
--- a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache
+++ b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-1b44e67eb0355946f2842be72c3f08fef726247b
+7ec8e6e96b1aabf7eafbfce9b741c29a6a5e1aab
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt
index a2645e04..cfc3f8ed 100644
--- a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt
+++ b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt
@@ -56,9 +56,6 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.exe
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.pdb
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj.AssemblyReference.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileInputs.cache
-C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.exe.config
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.exe.config
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.exe
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.pdb
@@ -68,12 +65,19 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\Oracle.Manag
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\log4net.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\SqlSugar.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Config.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\Newtonsoft.Json.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Log4net.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Repository.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Repository.dll.config
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\HighWayIot.Config.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.exe.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileInputs.cache
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.exe
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\MySql.Data.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot\bin\Debug\System.Data.SQLite.dll
diff --git a/HighWayIot/obj/Debug/HighWayIot.exe b/HighWayIot/obj/Debug/HighWayIot.exe
index 9f01a137..480fd38b 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.exe and b/HighWayIot/obj/Debug/HighWayIot.exe differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.pdb b/HighWayIot/obj/Debug/HighWayIot.pdb
index 88f3eedd..3f97e520 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.pdb and b/HighWayIot/obj/Debug/HighWayIot.pdb differ