fix

WCS.Service/Program.cs

@@ -19,17 +19,17 @@ namespace WCS.Service
             //互斥锁检测
             var mutexName = RedisHub.Default.Check("Mutex") ?? throw new Exception("请在Redis中配置互斥量值");
 
-            using var mt = new Mutex(true, mutexName);
-            if (mt.WaitOne())
-            {
-                CreateHostBuilder(args).Build().Run(); mt.ReleaseMutex();
-            }
-            else
-            {
-                Console.WriteLine("请勿重复运行");
-                //InfoLog.INFO_INIT("请勿重复运行");
-                Task.Delay(2000).Wait();
-            }
+            //using var mt = new Mutex(true, mutexName);
+            //if (mt.WaitOne())
+            //{
+                CreateHostBuilder(args).Build().Run(); /*mt.ReleaseMutex();*/
+            //}
+            //else
+            //{
+            //    Console.WriteLine("请勿重复运行");
+            //    //InfoLog.INFO_INIT("请勿重复运行");
+            //    Task.Delay(2000).Wait();
+            //}
         }
 
         /// <summary>

WCS.Service/WCS.Service.csproj

@@ -25,12 +25,11 @@
   <ItemGroup>
     <PackageReference Include="MessagePack" Version="2.5.108" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\业务工程\分拣库\WCS.WorkEngineering\WCS.WorkEngineering.csproj" />
+    <ProjectReference Include="..\WCS.WorkEngineering\WCS.WorkEngineering.csproj" />
   </ItemGroup>
 </Project>

WCS.WorkEngineering/Extensions/SRMExtension.cs

@@ -8,7 +8,7 @@ namespace WCS.WorkEngineering.Extensions
     /// <summary>
     /// 堆垛机扩展
     /// </summary>
-    public class SRM : Device<ISRM520, ISRM521, ISRM537>
+    public class SRM : Device<ISRM520, ISRM521, ISRM523>
     {
         public SRM(Device device, World world) : base(device, world)
         {

WCS.WorkEngineering/WCS.WorkEngineering.csproj

@@ -21,12 +21,11 @@
 
   <ItemGroup>
     <PackageReference Include="MessagePack" Version="2.5.108" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
-    <PackageReference Include="WCS.Entity.Protocol" Version="1.0.6.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\ServiceCenter\ServiceCenter.csproj" />
+    <ProjectReference Include="..\..\WcsFramework\ServiceCenter\ServiceCenter.csproj" />
+    <ProjectReference Include="..\..\WcsFramework\业务工程\分拣库\WCS.Entity.Protocol\WCS.Entity.Protocol.csproj" />
   </ItemGroup>
 
   <ItemGroup>

WCS.WorkEngineering/WorkStart.cs

@@ -45,18 +45,6 @@ namespace WCS.WorkEngineering
                     switch (connectionString.Key)
                     {
                         case "WCSDB"://WCS基本数据库
-                            //SqlSugarHelper.SetDefault(connectionString.Key);
-                            //_db.CodeFirst.InitTables(typeof(WCS_PlcData));
-                            //_db.CodeFirst.InitTables(typeof(WCS_TaskInfo));
-                            //_db.CodeFirst.InitTables(typeof(WCS_TaskDtl));
-                            //_db.CodeFirst.InitTables(typeof(WCS_TaskOld));
-                            //_db.CodeFirst.InitTables(typeof(WCS_AgvTaskInfo));
-                            //_db.CodeFirst.InitTables(typeof(WCS_Palletizing));
-                            //_db.CodeFirst.InitTables(typeof(WCS_PalletizingLayer));
-                            //_db.CodeFirst.InitTables(typeof(WCS_PalletizingRow));
-                            //_db.CodeFirst.InitTables(typeof(WCS_PalletizingLoc));
-                            //_db.CodeFirst.InitTables(typeof(WCS_CacheLine));
-                            //_db.CodeFirst.InitTables(typeof(WCS_CacheLineLoc));
 
                             break;
 
@@ -69,34 +57,9 @@ namespace WCS.WorkEngineering
                             SqlSugarHelper.SetPLC(connectionString.Key);
 
                             _db.DbMaintenance.CreateDatabase();
-                            _db.CodeFirst.InitTables<WCS_Log>();
-                            _db.CodeFirst.InitTables<WCS_SRM520>();
-                            _db.CodeFirst.InitTables<DevRunInfo>();
-                            _db.CodeFirst.InitTables<WCS_SRM521>();
-                            _db.CodeFirst.InitTables<WCS_SRM537>();
-                            _db.CodeFirst.InitTables<WCS_RGV520>();
-                            _db.CodeFirst.InitTables<WCS_RGV521>();
-                            _db.CodeFirst.InitTables<WCS_BCR80>();
-                            _db.CodeFirst.InitTables<WCS_BCR81>();
-                            _db.CodeFirst.InitTables<WCS_BCR83>();
-                            _db.CodeFirst.InitTables<WCS_Station520>();
-                            _db.CodeFirst.InitTables<WCS_Station521>();
-                            _db.CodeFirst.InitTables<WCS_Station523>();
-                            _db.CodeFirst.InitTables<WCS_Station524>();
-                            _db.CodeFirst.InitTables<WCS_Station525>();
-                            _db.CodeFirst.InitTables<WCS_Station90>();
-                            _db.CodeFirst.InitTables<WCS_Station91>();
-                            _db.CodeFirst.InitTables<WCS_Truss520>();
-                            _db.CodeFirst.InitTables<WCS_Truss521>();
-                            _db.CodeFirst.InitTables<WCS_Truss523>();
-                            _db.CodeFirst.InitTables<WCS_Truss530>();
-                            _db.CodeFirst.InitTables<WCS_Truss531>();
-                            _db.CodeFirst.InitTables<WCS_Robot520>();
-                            _db.CodeFirst.InitTables<WCS_Robot521>();
-                            _db.CodeFirst.InitTables<WCS_Robot522>();
-                            _db.CodeFirst.InitTables<WCS_Robot530>();
-                            _db.CodeFirst.InitTables<WCS_Robot531>();
-                            var a = false;
+                            //_db.CodeFirst.InitTables<DevRunInfo>();
+                            _db.CodeFirst.InitTables<DevAlarmInfo>();
+
                             break;
 
                         default: //其他库

分拣中心数据处理.sln

@@ -9,6 +9,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Service", "WCS.Service\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.WorkEngineering", "WCS.WorkEngineering\WCS.WorkEngineering.csproj", "{F0C3024E-060C-4F13-B9B7-4833EBED07B1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceCenter", "..\WcsFramework\ServiceCenter\ServiceCenter.csproj", "{5566D2E2-2484-4EA8-9D10-33A29BF648EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Entity.Protocol", "..\WcsFramework\业务工程\分拣库\WCS.Entity.Protocol\WCS.Entity.Protocol.csproj", "{96538DA5-A387-42B5-B258-BABCC541BE05}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlSugar", "..\..\..\..\Code\SqlSugar\Src\Asp.NetCore2\SqlSugar\SqlSugar.csproj", "{C561B818-CED4-4DF0-B4E5-F8D83A87109E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +29,18 @@ Global
 		{F0C3024E-060C-4F13-B9B7-4833EBED07B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0C3024E-060C-4F13-B9B7-4833EBED07B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0C3024E-060C-4F13-B9B7-4833EBED07B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5566D2E2-2484-4EA8-9D10-33A29BF648EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5566D2E2-2484-4EA8-9D10-33A29BF648EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5566D2E2-2484-4EA8-9D10-33A29BF648EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5566D2E2-2484-4EA8-9D10-33A29BF648EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96538DA5-A387-42B5-B258-BABCC541BE05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96538DA5-A387-42B5-B258-BABCC541BE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96538DA5-A387-42B5-B258-BABCC541BE05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96538DA5-A387-42B5-B258-BABCC541BE05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C561B818-CED4-4DF0-B4E5-F8D83A87109E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C561B818-CED4-4DF0-B4E5-F8D83A87109E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C561B818-CED4-4DF0-B4E5-F8D83A87109E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C561B818-CED4-4DF0-B4E5-F8D83A87109E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE