change-修复采集

Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f9d9caac0eee191810018a8da33b8e1237b0f0fb")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache

@@ -1 +1 @@
-eadcc1228f6056a0472f8d77385e47a79ee23c2d78d9df09d62b6ffbc0733c9f
+0868e6bde5b49a65a126b91d794e990427a11761

Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Admin.Core.RealTimeService
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\
+build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.RealTimeService\
-build_property.EnableComHosting = 
-build_property.EnableGeneratedComInterfaceComImportInterop = 

Aucma.Core.DataCollector/Factory/PackingCX02Factory.cs

@@ -72,7 +72,7 @@ namespace Aucma.Core.DataCollector.Factory
                     else
                     {
                         Task.Delay(base.AlarmReadTimer).Wait();
-                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
+                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
                     }
                 }
                 catch(Exception ex)
@@ -132,7 +132,7 @@ namespace Aucma.Core.DataCollector.Factory
                     else
                     {
                         Task.Delay(base.EleReadTimer).Wait();
-                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
+                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc"));
                     }
 
                 }

Aucma.Core.DataCollector/Factory/PalletizFactory.cs

@@ -72,7 +72,7 @@ namespace Aucma.Core.DataCollector.Factory
                     else
                     {
                         Task.Delay(base.AlarmReadTimer).Wait();
-                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
+                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreAPlc"));
                     }
                 }
                 catch(Exception ex)
@@ -132,7 +132,7 @@ namespace Aucma.Core.DataCollector.Factory
                     else
                     {
                         Task.Delay(base.EleReadTimer).Wait();
-                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
+                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreAPlc"));
                     }
 
                 }

Aucma.Core.DataCollector/Factory/TransPlatformCX02Factory.cs

@@ -72,7 +72,7 @@ namespace Aucma.Core.DataCollector.Factory
                     else
                     {
                         Task.Delay(base.AlarmReadTimer).Wait();
-                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
+                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("TransPlatform"));
                     }
                 }
                 catch(Exception ex)
@@ -132,7 +132,7 @@ namespace Aucma.Core.DataCollector.Factory
                     else
                     {
                         Task.Delay(base.EleReadTimer).Wait();
-                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
+                        _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("TransPlatform"));
                     }
 
                 }