diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index 7aca9fe8..2aa8fa0f 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [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.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index 4cb2545d..b3b30e6b 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -5caca2304f4590491b43ce93df3e504452ed5485bb030704447c9e4fe8003e00 +3c08b2a6f95957043123cba0d01dcd1675663fc7 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index 124dffb6..db881581 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Common\ diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 5f47aefc..a952d577 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [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.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 7baa76f2..257bfd4c 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -6acd03c5f6de6bc94d4c66f7aebdcc5276d95bd1858840cfa8769d10d8a5ddc5 +2af60005099f8dd0481f84ac0dfadb89cc4b6f1d diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index 05b5680f..20ee5954 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.EventBus\ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index c35eaee5..93109f44 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [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.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index 72301b3f..22c8e621 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -1a161e136cdac8202b243dc50ab5662d055c475aa46488f80799b3c3bf86abe6 +790ffd47e6e46a3c8a83558ad3550154a5c81377 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig index 0aabde02..5879585b 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Extensions\ diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 6bfdea33..7a3f49c3 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [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.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index c1820a78..4390da2f 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -2f6a3daa5c43375d27114bfa5e0165221d912c3421007b8131669b05ae8afb43 +7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig index 73c91585..417dcd7b 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig @@ -1,5 +1,3 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.FrameWork\ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 997d64d5..d6ce58a3 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [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.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 0452ff84..7f17d033 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -103e48645555a053b7f32f43974f060db0ba38fb228e30d69228024be5feac38 +80bb097f76aa594dc58289065a284d1acbd8bdff diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index 45c5ccf7..b3be67cc 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IRepository\ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index bd8466e6..e0cda4ad 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [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.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index 99adc881..d5703477 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -97869c1f1c7ce370472680ce873924edbfcd44f0c4a3ad5df16ada2491fa5397 +51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index b4c8c9fc..b8fc4712 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IService\ diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 174fcf69..98e3cd85 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [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.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index a4afd84d..84a57232 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -cae519cc978c694bd82cb2367c909dc749c4a996ebe9a798b8ee4391e4a3f183 +ef9752cf3f9e33d53832c154eeba975830dced91 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index b49210f4..2cf38129 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Model\ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index 4260f10f..ec5c5695 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [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.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index 2ba8a465..ba9c706f 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -3691d45b9ad2962ad3d611f8f79287fa4e0979f3482c4d2f4636ef9d914b2a94 +046606c52f7e20e88e6dd5ffc01e33664c4b9ff8 diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig index fda551fc..139ebdab 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Repository\ diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index 343e28cb..80f512b2 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [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.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index aaf4b5a1..17b49c29 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -23e397e2f9bfd175b78084de72f33a96fd8bbbf82cad6775084ed44a10b5fd87 +dbec6c73777a8ebf7006f00f1928199755951ac1 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index 7fe89e3c..d169bb09 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Serilog.Es\ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index e51f9b35..ec38a905 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [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.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index d99a0abe..5904500d 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -5f04e2389337c831b7a49e043e6c8cbaac69518146efc499036982d073f31447 +ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542 diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig index 8cc143a5..ede2b67e 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Service\ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 032a3603..83f017e2 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [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.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index b6e2a32c..a5578479 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -f4b0bc80f5ae2b135fab223f19e888970a3c86008b12671f26ba845002ecffe6 +da4240456d30e56fa6c5e71babf5565adb3e1436 diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index 88638f9a..8c04f09e 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Tasks\ diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs index 866a6ed4..5e48c157 100644 --- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs +++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs @@ -17,6 +17,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using Aucma.Core.HwPLc; using RabbitMQ.Client; +using log4net; namespace Aucma.Core.CodeBinding.Views { @@ -25,6 +26,9 @@ namespace Aucma.Core.CodeBinding.Views /// public partial class IndexPageView : UserControl { + + private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageView)); + public IndexPageView() { InitializeComponent(); @@ -44,6 +48,7 @@ namespace Aucma.Core.CodeBinding.Views if (SendPlcPass()) { MessageBox.Show("放行成功"); + log.Error("空板按钮异常启动放行"); } else { diff --git a/Aucma.Core.CodeBinding/appsettings.json b/Aucma.Core.CodeBinding/appsettings.json index 0c950315..4c8a31fe 100644 --- a/Aucma.Core.CodeBinding/appsettings.json +++ b/Aucma.Core.CodeBinding/appsettings.json @@ -213,7 +213,7 @@ } ], "StationInfo": { - "StationCode": "1010", + "StationCode": "1008", "ProductLineCode": "CX_02" }, @@ -267,15 +267,15 @@ "Enabled": true, "IP": "10.10.92.49", "Port": 2014 - }, - { - "Id": 7, - "EquipName": "Palletiz", - "PlcType": "Melsec", - "Enabled": true, - "IP": "10.10.92.80", //10.10.92.80 - "Port": 2015 } + //{ + // "Id": 7, + // "EquipName": "Palletiz", + // "PlcType": "Melsec", + // "Enabled": true, + // "IP": "10.10.92.80", + // "Port": 2013 + //} ], "IpRateLimiting": { diff --git a/Aucma.Core.DataCollector/DataCollectorSetup.cs b/Aucma.Core.DataCollector/DataCollectorSetup.cs index eb847ed8..0b978baa 100644 --- a/Aucma.Core.DataCollector/DataCollectorSetup.cs +++ b/Aucma.Core.DataCollector/DataCollectorSetup.cs @@ -22,7 +22,7 @@ namespace Aucma.Core.DataCollector if (app == null) throw new ArgumentNullException(nameof(app)); var stationCode = Appsettings.app("StationInfo", "StationCode"); - Console.WriteLine($"获取当前工位编码：{stationCode}"); + var _deviceParamServices = app.ApplicationServices.GetService(); var _deviceAlarmInfoServices = app.ApplicationServices.GetService(); var _deviceElectricityServices = app.ApplicationServices.GetService< IRecordDeviceElectricityServices>(); @@ -31,7 +31,7 @@ namespace Aucma.Core.DataCollector { try { - if (stationCode == "1002") //箱壳、内胆，包含预装线、集存库 + if (stationCode == "1002") //暂未使用--箱壳、内胆，包含预装线、集存库 { Task.Run(() => { @@ -47,84 +47,80 @@ namespace Aucma.Core.DataCollector Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); } - else if (stationCode == "1004")//泡前库、发泡线、发泡机、泡后库 + else if (stationCode == "1005")//泡前库、发泡线、发泡机 { - //发泡机 Task.Run(() => { DataCollectorFactory collector = new BoxFoamFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - //发泡线1 + } + else if (stationCode == "1008")//条码绑定工位 + { + // 包装线采集 Task.Run(() => { - DataCollectorFactory collector = new BoxFoamFixture1Factory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new PackingCX02Factory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); - }); - //发泡线2 + }); + + // 箱壳 Task.Run(() => { - DataCollectorFactory collector = new BoxFoamFixture2Factory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new ShellStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - } - else if (stationCode == "1012")//门体发泡 - { - Console.WriteLine("开始执行异常数据采集"); + // 内胆 Task.Run(() => { - DataCollectorFactory collector = new DoorFoamFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new LinerStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - } - else if (stationCode == "1010")//成品分垛 - { - //Task.Run(() => - //{ - // DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); - - // Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); - //}); + //箱壳预装线 Task.Run(() => { - DataCollectorFactory collector = new ShellStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new ShellPreassembleFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - + // 内胆预装线 Task.Run(() => { - DataCollectorFactory collector = new LinerStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new LinerPreassembleFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - + // 泡后库 Task.Run(() => { - DataCollectorFactory collector = new ShellPreassembleFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new FoamBackFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - + } + else if (stationCode == "1010")//分垛A库 + { + // 二线分垛 Task.Run(() => { - DataCollectorFactory collector = new LinerPreassembleFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); - + // 二线输送平台 Task.Run(() => { - DataCollectorFactory collector = new FoamBackFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + DataCollectorFactory collector = new TransPlatformCX02Factory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); }); } - }catch(Exception ex) + } + catch(Exception ex) { _logger.Error($"UseDataCollectorExtensions逻辑执行异常:{ex.Message}"); } diff --git a/Aucma.Core.DataCollector/Factory/PackingCX02Factory.cs b/Aucma.Core.DataCollector/Factory/PackingCX02Factory.cs new file mode 100644 index 00000000..0c4500d5 --- /dev/null +++ b/Aucma.Core.DataCollector/Factory/PackingCX02Factory.cs @@ -0,0 +1,187 @@ +using Admin.Core.Common.Helper; +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using Aucma.Core.HwPLc; +using log4net; +using System.Globalization; + +namespace Aucma.Core.DataCollector.Factory +{ + /// + /// 二线打包线数据采集 + /// + public class PackingCX02Factory : DataCollectorFactory + { + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("条码绑定Plc")); + + public PackingCX02Factory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) + { + } + + /// + /// 采集二线打包线设备报警信息 + /// + /// + /// + public override void CollectDeviceAlarmInfo(out List deviceAlarmInfos) + { + while(true) + { + try + { + var deviceParams1 = base._deviceParamServices.Query(x => x.DeviceCode == "E00011"); + + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集二线打包线设备报警信息"); + var plc = _plc.plc; + + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00011"); + + if (deviceParams != null) + { + deviceAlarmInfos = new List(); + string batchId = System.Guid.NewGuid().ToString("N"); + foreach (var item in deviceParams) + { + base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue); + + if (paramValue != 0) + { + deviceAlarmInfos.Add(new Record_DeviceAlarmInfo() + { + BatchId = batchId, + DeviceCode = item.DeviceCode, + DeviceType = "1", + ParamCode = item.ParamCode, + ParamValue = paramValue.ToString(), + AlarmInfo = item.ParamName, + AlarmTime = DateTime.Now, + CreadtedTime = DateTime.Now, + }); + } + + } + if (deviceAlarmInfos.Count > 0) + { + base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); + } + } + Task.Delay(base.AlarmReadTimer).Wait(); + } + else + { + Task.Delay(base.AlarmReadTimer).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz")); + } + } + catch(Exception ex) + { + base._logger.Error($"采集二线打包线设备报警信息:{ex.Message}"); + } + } + } + + /// + /// 采集二线打包线设备用电信息 + /// + /// + /// + public override void CollectDeviceElectricity(out List deviceElectricitys) + { + while (true) + { + try + { + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集二线打包线设备用电信息"); + var plc = _plc.plc; + + deviceElectricitys = new List(); + + + string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" }; + + Record_DeviceElectricity _deviceElectricity_ground = new Record_DeviceElectricity() + { + + MonitorId = "E00011_0001" + }; + + base.ReadDeviceElectricity(ground, plc, ref _deviceElectricity_ground); + + deviceElectricitys.Add(_deviceElectricity_ground); + + string[] platform = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" }; + + Record_DeviceElectricity _deviceElectricity_platform = new Record_DeviceElectricity() + { + + MonitorId = "E00011_0002" + }; + + base.ReadDeviceElectricity(platform, plc, ref _deviceElectricity_platform); + + deviceElectricitys.Add(_deviceElectricity_platform); + + var result = base._deviceElectricityServices.AddAsync(deviceElectricitys); + + Task.Delay(base.EleReadTimer).Wait(); + } + else + { + Task.Delay(base.EleReadTimer).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz")); + } + + } + catch (Exception ex) + { + base._logger.Error($"采集二线打包线设备用电信息:{ex.Message}"); + } + } + } + + public byte[] array(byte[] data) + { + if (data == null) return null; + for (int i = 0; i < data.Length; i += 2) + { + byte temp = data[i]; + data[i] = data[i + 1]; + data[i + 1] = temp; + } + + return data; + } + + /// + /// 用电数据解析 + /// + /// + /// + /// + /// + /// + private int[] ParseAndReverseByteArray(byte[] data, int startIndex, int length) + { + if (data == null || data.Length < startIndex + length) + { + throw new ArgumentException("Invalid data or startIndex/length parameter."); + } + + int[] resultArray = new int[length / 2]; + for (int i = 0; i < resultArray.Length; i++) + { + byte[] subset = new byte[2]; + Array.Copy(data, startIndex + (i * 2), subset, 0, 2); + Array.Reverse(subset); + string hexString = BitConverter.ToString(subset).Replace("-", ""); + resultArray[i] = Convert.ToInt32(hexString, 16); + } + + return resultArray; + } + } +} diff --git a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs index b74c1597..c3f2d6f5 100644 --- a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs +++ b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs @@ -12,14 +12,14 @@ namespace Aucma.Core.DataCollector.Factory /// public class PalletizFactory : DataCollectorFactory { - private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz")); + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreAPlc")); public PalletizFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) { } /// - /// 采集成品分垛设备报警信息 + /// 采集成品A库分垛设备报警信息 /// /// /// @@ -29,13 +29,14 @@ namespace Aucma.Core.DataCollector.Factory { try { - + var deviceParams1 = base._deviceParamServices.Query(x => x.DeviceCode == "E00023"); + if (_plc != null) { Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集成品分垛设备报警信息"); var plc = _plc.plc; - var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00002"); + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00023"); if (deviceParams != null) { @@ -94,7 +95,7 @@ namespace Aucma.Core.DataCollector.Factory { if (_plc != null) { - Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备用电数据"); + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集成品分垛设备用电数据"); var plc = _plc.plc; deviceElectricitys = new List(); @@ -104,7 +105,8 @@ namespace Aucma.Core.DataCollector.Factory Record_DeviceElectricity _deviceElectricity_ground = new Record_DeviceElectricity() { - MonitorId = "E0003" + // A库B区域 + MonitorId = "E00023_0002" }; base.ReadDeviceElectricity(ground, plc, ref _deviceElectricity_ground); @@ -115,7 +117,8 @@ namespace Aucma.Core.DataCollector.Factory Record_DeviceElectricity _deviceElectricity_platform = new Record_DeviceElectricity() { - MonitorId = "E0004" + // A库A区域 + MonitorId = "E00023_0001" }; base.ReadDeviceElectricity(platform, plc, ref _deviceElectricity_platform); diff --git a/Aucma.Core.DataCollector/Factory/TransPlatformCX02Factory.cs b/Aucma.Core.DataCollector/Factory/TransPlatformCX02Factory.cs new file mode 100644 index 00000000..c5546c2a --- /dev/null +++ b/Aucma.Core.DataCollector/Factory/TransPlatformCX02Factory.cs @@ -0,0 +1,187 @@ +using Admin.Core.Common.Helper; +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using Aucma.Core.HwPLc; +using log4net; +using System.Globalization; + +namespace Aucma.Core.DataCollector.Factory +{ + /// + /// 物料输送平台数据采集 + /// + public class TransPlatformCX02Factory : DataCollectorFactory + { + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("TransPlatform")); + + public TransPlatformCX02Factory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) + { + } + + /// + /// 采集物料输送平台设备报警信息 + /// + /// + /// + public override void CollectDeviceAlarmInfo(out List deviceAlarmInfos) + { + while(true) + { + try + { + var deviceParams1 = base._deviceParamServices.Query(x => x.DeviceCode == "E00034"); + + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集物料输送平台设备报警信息"); + var plc = _plc.plc; + + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00034"); + + if (deviceParams != null) + { + deviceAlarmInfos = new List(); + string batchId = System.Guid.NewGuid().ToString("N"); + foreach (var item in deviceParams) + { + base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue); + + if (paramValue != 0) + { + deviceAlarmInfos.Add(new Record_DeviceAlarmInfo() + { + BatchId = batchId, + DeviceCode = item.DeviceCode, + DeviceType = "1", + ParamCode = item.ParamCode, + ParamValue = paramValue.ToString(), + AlarmInfo = item.ParamName, + AlarmTime = DateTime.Now, + CreadtedTime = DateTime.Now, + }); + } + + } + if (deviceAlarmInfos.Count > 0) + { + base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); + } + } + Task.Delay(base.AlarmReadTimer).Wait(); + } + else + { + Task.Delay(base.AlarmReadTimer).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz")); + } + } + catch(Exception ex) + { + base._logger.Error($"采集物料输送平台设备报警信息:{ex.Message}"); + } + } + } + + /// + /// 采集物料输送平台设备用电信息 + /// + /// + /// + public override void CollectDeviceElectricity(out List deviceElectricitys) + { + while (true) + { + try + { + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集物料输送平台设备用电信息"); + var plc = _plc.plc; + + deviceElectricitys = new List(); + + // 20机柜 + string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" }; + + Record_DeviceElectricity _deviceElectricity_ground = new Record_DeviceElectricity() + { + + MonitorId = "E00034_0001" + }; + + base.ReadDeviceElectricity(ground, plc, ref _deviceElectricity_ground); + + deviceElectricitys.Add(_deviceElectricity_ground); + // 21机柜 + string[] platform = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" }; + + Record_DeviceElectricity _deviceElectricity_platform = new Record_DeviceElectricity() + { + + MonitorId = "E00034_0002" + }; + + base.ReadDeviceElectricity(platform, plc, ref _deviceElectricity_platform); + + deviceElectricitys.Add(_deviceElectricity_platform); + + var result = base._deviceElectricityServices.AddAsync(deviceElectricitys); + + Task.Delay(base.EleReadTimer).Wait(); + } + else + { + Task.Delay(base.EleReadTimer).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz")); + } + + } + catch (Exception ex) + { + base._logger.Error($"采集物料输送平台设备用电信息:{ex.Message}"); + } + } + } + + public byte[] array(byte[] data) + { + if (data == null) return null; + for (int i = 0; i < data.Length; i += 2) + { + byte temp = data[i]; + data[i] = data[i + 1]; + data[i + 1] = temp; + } + + return data; + } + + /// + /// 用电数据解析 + /// + /// + /// + /// + /// + /// + private int[] ParseAndReverseByteArray(byte[] data, int startIndex, int length) + { + if (data == null || data.Length < startIndex + length) + { + throw new ArgumentException("Invalid data or startIndex/length parameter."); + } + + int[] resultArray = new int[length / 2]; + for (int i = 0; i < resultArray.Length; i++) + { + byte[] subset = new byte[2]; + Array.Copy(data, startIndex + (i * 2), subset, 0, 2); + Array.Reverse(subset); + string hexString = BitConverter.ToString(subset).Replace("-", ""); + resultArray[i] = Convert.ToInt32(hexString, 16); + } + + return resultArray; + } + } +} diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj index e6bbe75b..ecd2333f 100644 --- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj +++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj @@ -1,7 +1,7 @@  - Exe + WinExe net6.0-windows enable true diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs index 1e8df4a1..93ac5a3a 100644 --- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs +++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs @@ -135,12 +135,12 @@ namespace Aucma.Core.Palletiz.Business { if (string.IsNullOrEmpty(asciiStr)) { - throw new ArgumentException($"入库申请处理异常:条码信息为空"); + throw new ArgumentException($"条码信息为空"); } if (string.IsNullOrEmpty(spaceArea)) { - throw new ArgumentException($"入库申请处理异常:货道区域为空"); + throw new ArgumentException($"货道区域为空"); } @@ -149,7 +149,7 @@ namespace Aucma.Core.Palletiz.Business if (prodInfo == null) { - throw new ArgumentException($"入库申请处理异常:根据成品码获取成品信息为空"); + throw new ArgumentException($"根据成品码获取成品信息为空"); } RefreshProductInfoEvent?.Invoke(asciiStr,prodInfo.ProductModel,prodInfo.ProductOrderNo); @@ -158,7 +158,7 @@ namespace Aucma.Core.Palletiz.Business out BaseSpaceInfo spaceinfo); if(!getSpaceResult) { - msg = $"未找到货道,请检查该型号是否有货道"; + msg = $"未找到货道,请检查该型号是否有货道或者货道已满"; RefreshMsgEvent?.Invoke(msg); return; } @@ -198,7 +198,7 @@ namespace Aucma.Core.Palletiz.Business { msg = msg + "放行失败"; RefreshMsgEvent?.Invoke(msg); - throw new ArgumentException($"入库申请处理异常:入库任务下发至PLC失败"); + throw new ArgumentException($"入库任务下发至PLC失败，等待plc响应超时"); } else { @@ -225,7 +225,7 @@ namespace Aucma.Core.Palletiz.Business } catch (Exception e) { - msg =$"入库逻辑处理异常:{e.Message}"; + msg =$"{e.Message}"; RefreshMsgEvent?.Invoke(msg); } diff --git a/Aucma.Core.Palletiz/Startup.cs b/Aucma.Core.Palletiz/Startup.cs index 63bc7b8b..2cdf266e 100644 --- a/Aucma.Core.Palletiz/Startup.cs +++ b/Aucma.Core.Palletiz/Startup.cs @@ -112,6 +112,7 @@ namespace Aucma.Core.Palletiz // Socketɨ app.UseTouchSocketMildd(socket); + app.UseDataCollectorExtensions(); } diff --git a/Aucma.Core.Palletiz/appsettings.json b/Aucma.Core.Palletiz/appsettings.json index 0048502d..f2571e6b 100644 --- a/Aucma.Core.Palletiz/appsettings.json +++ b/Aucma.Core.Palletiz/appsettings.json @@ -198,9 +198,18 @@ "Enabled": true, "IP": "10.10.92.80", //10.10.92.80 "Port": 2014 + }, + { + "Id": 2, + "EquipName": "TransPlatform", + "PlcType": "Melsec", + "Enabled": true, + "IP": "10.10.92.75", + "Port": 2015 } ], "StoreInfo": { + "StationCode": "1010", "StationName": "成品分垛库", "PalletizStoreCodeA": "FDK-001", "PalletizStoreCodeB": "FDK-002",