diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index c461dd02..fbf527ac 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -78,7 +78,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -263,7 +263,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -332,7 +332,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -389,6 +389,9 @@ }, "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + }, + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" } } } @@ -424,7 +427,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -486,7 +489,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -548,7 +551,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -607,7 +610,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -666,7 +669,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -751,7 +754,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -816,7 +819,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -893,7 +896,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -954,7 +957,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -1015,7 +1018,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -1077,7 +1080,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -1142,7 +1145,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -1210,7 +1213,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -1272,7 +1275,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, @@ -1337,7 +1340,66 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + } + } + }, + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "projectName": "Aucma.Core.TemperatureTask", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net6.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "projectReferences": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "net6.0": { + "targetAlias": "net6.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index a5a55588..45fd8234 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\admin\.nuget\packages\ PackageReference - 6.7.0 + 6.8.1 diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index 54855832..18b25463 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index f397a84b..2d92604c 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -657de05911c5c4d0cacaf803801b5cfb9cac90ef +6595f7ba4e0a05ad222d8d47acb1a5dea054ac8fd23612b0d9b2c1a982a2210f diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 601c80d9..2da89fb6 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -10,6 +10,8 @@ build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index 015cf9d9..1c7113a0 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index b85a3c71..421b74c0 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -4054,6 +4054,7 @@ "Aucma.Core.ScannerGun": "1.0.0", "Aucma.Core.SheetMetalTasks": "1.0.0", "Aucma.Core.Tasks": "1.0.0", + "Aucma.Core.TemperatureTask": "1.0.0", "Microsoft.AspNetCore.Authentication.JwtBearer": "5.0.9" }, "compile": { @@ -4266,6 +4267,19 @@ "runtime": { "bin/placeholder/Aucma.Core.Tasks.dll": {} } + }, + "Aucma.Core.TemperatureTask/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v6.0", + "dependencies": { + "Admin.Core.IService": "1.0.0" + }, + "compile": { + "bin/placeholder/Aucma.Core.TemperatureTask.dll": {} + }, + "runtime": { + "bin/placeholder/Aucma.Core.TemperatureTask.dll": {} + } } } }, @@ -11266,6 +11280,11 @@ "type": "project", "path": "../Aucma.Core.Tasks/Aucma.Core.Tasks.csproj", "msbuildProject": "../Aucma.Core.Tasks/Aucma.Core.Tasks.csproj" + }, + "Aucma.Core.TemperatureTask/1.0.0": { + "type": "project", + "path": "../Aucma.Core.TemperatureTask/Aucma.Core.TemperatureTask.csproj", + "msbuildProject": "../Aucma.Core.TemperatureTask/Aucma.Core.TemperatureTask.csproj" } }, "projectFileDependencyGroups": { @@ -11354,7 +11373,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index 0fd29881..a4e6030f 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "zUJKG1it2atk1K/36dikIrzSvbVxOeQPJzhSQ0x5AkWQABJOGsRi7jWYobYmXOtrAAYBAZom/NVKnjQPhU3kHQ==", + "dgSpecHash": "y71ivDyTYdR/IgUXlTvD3CXxLXbhiQ1Hb07ica+UKBq6fSSITCog9XyAeD/4mgcrQIw7WTZTNH1PnBd8KlSbhw==", "success": true, "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ 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 2aa8fa0f..e59f1ec2 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 b3b30e6b..7010b962 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 @@ -3c08b2a6f95957043123cba0d01dcd1675663fc7 +b599770ee407fe896e0bee7dfc7103f5198f20a80e32c8697c91799b70e146ca 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 decf85c2..124dffb6 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 @@ -9,3 +9,5 @@ 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 = 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 a952d577..88fe817c 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 257bfd4c..8c2623c3 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 @@ -2af60005099f8dd0481f84ac0dfadb89cc4b6f1d +6de8b0dcfc48b128033fd3bbdc30713db3e9facb0ff8080ceed7668b8701a863 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 f38a35e7..05b5680f 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 @@ -9,3 +9,5 @@ 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 = diff --git a/Admin.Core.Extensions/Admin.Core.Extensions.csproj b/Admin.Core.Extensions/Admin.Core.Extensions.csproj index 36714374..1585988f 100644 --- a/Admin.Core.Extensions/Admin.Core.Extensions.csproj +++ b/Admin.Core.Extensions/Admin.Core.Extensions.csproj @@ -25,6 +25,7 @@ + diff --git a/Admin.Core.Extensions/Middlewares/TemperatureTaskMildd.cs b/Admin.Core.Extensions/Middlewares/TemperatureTaskMildd.cs new file mode 100644 index 00000000..f9674a2a --- /dev/null +++ b/Admin.Core.Extensions/Middlewares/TemperatureTaskMildd.cs @@ -0,0 +1,27 @@ +using Aucma.Core.TemperatureTask; +using log4net; +using Microsoft.AspNetCore.Builder; +using System; + +namespace Admin.Core.Extensions.Middlewares +{ + public static class TemperatureTaskMildd + { + private static readonly ILog log = LogManager.GetLogger(typeof(AucamSheetMetalTaskMildd)); + public static void UseTemperatureTaskMildds(this IApplicationBuilder app, IAucamTemperatureMeasurementService aucamTemperatureMeasurementService) + { + if (app == null) throw new ArgumentNullException(nameof(app)); + + try + { + aucamTemperatureMeasurementService.Execute(); + Console.WriteLine("测温服务已开启"); + } + catch (Exception e) + { + log.Error($"An error was reported when starting the job service.\n{e.Message}"); + throw; + } + } + } +} diff --git a/Admin.Core.Extensions/ServiceExtensions/TemperatureTaskSetup.cs b/Admin.Core.Extensions/ServiceExtensions/TemperatureTaskSetup.cs new file mode 100644 index 00000000..cf476451 --- /dev/null +++ b/Admin.Core.Extensions/ServiceExtensions/TemperatureTaskSetup.cs @@ -0,0 +1,33 @@ +using Aucma.Core.SheetMetalTasks; +using Aucma.Core.TemperatureTask; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Linq; +using System.Reflection; + +namespace Admin.Core.Extensions +{ + /// + /// 启动测温定时服务 + /// + public static class TemperatureTaskSetup + { + public static void AddTemperatureTaskSetup(this IServiceCollection services) + { + services.AddSingleton(); + + var baseType = typeof(IAucamTemperatureMeasurementService); + var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory; + var referencedAssemblies = System.IO.Directory.GetFiles(path, "Aucma.Core.TemperatureTask.dll").Select(Assembly.LoadFrom).ToArray(); + var types = referencedAssemblies + .SelectMany(a => a.DefinedTypes) + .Select(type => type.AsType()) + .Where(x => x != baseType && baseType.IsAssignableFrom(x)).ToArray(); + var implementTypes = types.Where(x => x.IsClass).ToArray(); + foreach (var implementType in implementTypes) + { + services.AddTransient(implementType); + } + } + } +} \ No newline at end of file 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 93109f44..06d510fe 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 22c8e621..aaaf8bd1 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 @@ -790ffd47e6e46a3c8a83558ad3550154a5c81377 +dffc6a08829f7f9594af6c1484816eceabd35a3c35bbbd569549b474aba6e447 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 2ffa7b25..0aabde02 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 @@ -9,3 +9,5 @@ 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 = 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 7a3f49c3..6f5418aa 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 4390da2f..a03d5773 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 @@ -7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 +c439f0743b2ab061130800af9e199d9d748586e7dd45924dd104324c65f5343c 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 34f11e1e..73c91585 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,3 +1,5 @@ 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 = diff --git a/Admin.Core.IRepository/IRepository_New/ITemperatureHistoryRepository.cs b/Admin.Core.IRepository/IRepository_New/ITemperatureHistoryRepository.cs index 8cfdc908..a5c2d599 100644 --- a/Admin.Core.IRepository/IRepository_New/ITemperatureHistoryRepository.cs +++ b/Admin.Core.IRepository/IRepository_New/ITemperatureHistoryRepository.cs @@ -1,5 +1,6 @@ using Admin.Core.Model; using Admin.Core.Model.Model_New; +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -10,5 +11,17 @@ namespace Admin.Core.IRepository /// public interface ITemperatureHistoryRepository : IBaseRepository { + /// + /// 传递时间时间 调用存储过程 获取测温历史记录 + /// + /// 起始时间 + /// + List QueryTemperatureHistory(DateTime startTime); + /// + /// 传递条码 调用存储过程 获取测温历史记录 + /// + /// 条码 + /// + List QueryTemperatureHistory(string barCode); } } \ No newline at end of file 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 d6ce58a3..12d6db84 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 7f17d033..a6e90e7f 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 @@ -80bb097f76aa594dc58289065a284d1acbd8bdff +b15ed3d62aa91c5139d415717d5d02b2369ed1631e05498b732534010ba56d6f 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 2b7e2280..45c5ccf7 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 @@ -9,3 +9,5 @@ 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 = diff --git a/Admin.Core.IService/IService_New/ITemperatureHistoryServices.cs b/Admin.Core.IService/IService_New/ITemperatureHistoryServices.cs index 5156fe60..8151412a 100644 --- a/Admin.Core.IService/IService_New/ITemperatureHistoryServices.cs +++ b/Admin.Core.IService/IService_New/ITemperatureHistoryServices.cs @@ -1,6 +1,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.ViewModels; +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -11,6 +12,18 @@ namespace Admin.Core.IService /// public interface ITemperatureHistoryServices : IBaseServices { + /// + /// 根据起始时间查询 测温历史记录 + /// + /// + /// + List QueryTemperatureHistory(DateTime startTime); + /// + ///根据条码查询历史记录 + /// + /// + /// + List QueryTemperatureHistory(string barCode); } } \ No newline at end of file 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 e0cda4ad..b18b5110 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 d5703477..1bd36a55 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 @@ -51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c +b960962ff5ee8813163b448cfec6d88ec854758ac69b93268364326dae441531 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 ba998751..b4c8c9fc 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 @@ -9,3 +9,5 @@ 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 = 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 98e3cd85..fdf56c4f 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 84a57232..2e40fb45 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 @@ -ef9752cf3f9e33d53832c154eeba975830dced91 +3c40f91aa5e16ca4d3191d787932e032eb151c5fa525bf72ef5053c26bc878bd 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 f17e3fdc..b49210f4 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 @@ -9,3 +9,5 @@ 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 = diff --git a/Admin.Core.RealTimeService/Startup.cs b/Admin.Core.RealTimeService/Startup.cs index dadc1c69..9e328dd4 100644 --- a/Admin.Core.RealTimeService/Startup.cs +++ b/Admin.Core.RealTimeService/Startup.cs @@ -3,6 +3,7 @@ using Admin.Core.Extensions; using Admin.Core.IService.ISys; using Admin.Core.Tasks; using Aucma.Core.RunPlc; +using Aucma.Core.Scanner; using Aucma.Core.ScannerGun; using Aucma.Core.Tasks; using Autofac; @@ -59,7 +60,7 @@ namespace Admin.Core.RealTimeService // //services.AddJobSetup(); // - // services.AddAucmaTaskSetup(); + services.AddScannerSetup(); services.AddScannerGunSetup(); //ֱ֧ȫ :֧ System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030") Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); @@ -81,7 +82,7 @@ namespace Admin.Core.RealTimeService /// /// /// - public void Configure(IApplicationBuilder app, IScannerGunService scannerGun)//, IRunPlcService plc, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter + public void Configure(IApplicationBuilder app, IScannerService scaner)//, IRunPlcService plc, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter { // ʹþ̬ļ app.UseStaticFiles(); @@ -89,7 +90,7 @@ namespace Admin.Core.RealTimeService //app.UsePlcMildd(plc); // QuartzNetJobȷ //app.UseQuartzJobMildd(tasksQzService, schedulerCenter); - app.UseScannerGunMildd(scannerGun); + app.UseScannerMildd(scaner); } diff --git a/Admin.Core.RealTimeService/appsettings.json b/Admin.Core.RealTimeService/appsettings.json index b2a12f60..f5056db7 100644 --- a/Admin.Core.RealTimeService/appsettings.json +++ b/Admin.Core.RealTimeService/appsettings.json @@ -167,6 +167,9 @@ "ScannerGun": { "Enabled": true }, + "Scanner": { + "Enabled": true + }, "AucamTask": { "Enabled": false } diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index d49abd81..89cfe860 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index d77b8cba..a4fb1a48 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1 +1 @@ -0868e6bde5b49a65a126b91d794e990427a11761 +ffe85bc2871e10e4f4deabf6433e768a4eb932a7d3809316277215a444c9f5c2 diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig index ce84cb9f..8f33dc40 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig @@ -9,3 +9,5 @@ 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.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs b/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs index cde15392..350b5dc8 100644 --- a/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs +++ b/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs @@ -1,19 +1,50 @@ using Admin.Core.IRepository; using Admin.Core.Model; -using Admin.Core.Model.Model_New; +using SqlSugar; +using System; using System.Collections.Generic; using System.Threading.Tasks; namespace Admin.Core.Repository { /// - /// TemperatureHistoryRepository + /// 测温存储过程 /// public class TemperatureHistoryRepository : BaseRepository, ITemperatureHistoryRepository { public TemperatureHistoryRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { } - + + #region 传递时间时间 调用存储过程 获取测温历史记录 + /// + /// 传递的参数为信息起始时间，该存储过程会提取从起始时间开始按时间排序的 2000 条数据 + /// + /// + public List QueryTemperatureHistory(DateTime startTime) + { + var s = new SugarParameter("@p", startTime); + var res = new SugarParameter("@History", null, true);//设置为output + var list = Db.CopyNew().Ado.UseStoredProcedure().SqlQuery("Data_ForMES2", s); + return list; + } + #endregion + + + #region 传递条码 调用存储过程 获取测温历史记录 + /// + /// 调用存储过程 获取测温历史记录 + /// + /// + public List QueryTemperatureHistory(string barCode) + { + string startTime = string.Empty; + string endTime = string.Empty; + var s = new SugarParameter("@p", barCode); + var res = new SugarParameter("@History", null, true);//设置为output + var list = Db.CopyNew().Ado.UseStoredProcedure().SqlQuery("Data_ForMES", s); + return list; + } + #endregion } } \ No newline at end of file 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 ec5c5695..9707d0f6 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 ba9c706f..5e7a5810 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 @@ -046606c52f7e20e88e6dd5ffc01e33664c4b9ff8 +fe7c924978ded9c3cdf0f9f7492dccb0324b897050d32f2dd46ac8439851acac 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 41538400..fda551fc 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 @@ -9,3 +9,5 @@ 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 = 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 80f512b2..dd6a686c 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 17b49c29..c8e11554 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 @@ -dbec6c73777a8ebf7006f00f1928199755951ac1 +a9badd67957e2093975a45f0b8bdf4f368d78415c81f5178dbc72c651233d914 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 a581a844..7fe89e3c 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 @@ -9,3 +9,5 @@ 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 = diff --git a/Admin.Core.Service/Service_New/TemperatureHistoryServices.cs b/Admin.Core.Service/Service_New/TemperatureHistoryServices.cs index daf304b4..0431a1b1 100644 --- a/Admin.Core.Service/Service_New/TemperatureHistoryServices.cs +++ b/Admin.Core.Service/Service_New/TemperatureHistoryServices.cs @@ -14,15 +14,35 @@ using System.Threading.Tasks; namespace Admin.Core.Service { - public class TemperatureHistoryServices : BaseServices,ITemperatureHistoryServices + public class TemperatureHistoryServices : BaseServices, ITemperatureHistoryServices { private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(TemperatureHistoryServices)); private readonly IBaseRepository _dal; + private readonly ITemperatureHistoryRepository _temperatureHistoryRepository; - public TemperatureHistoryServices(IBaseRepository dal) + public TemperatureHistoryServices(IBaseRepository dal, ITemperatureHistoryRepository temperatureHistoryRepository) { this._dal = dal; base.BaseDal = dal; + _temperatureHistoryRepository = temperatureHistoryRepository; + } + /// + /// 传递时间时间 调用存储过程 获取测温历史记录 + /// + /// 开始时间 + /// + public List QueryTemperatureHistory(DateTime startTime) + { + return _temperatureHistoryRepository.QueryTemperatureHistory(startTime); + } + /// + /// 传递条码 调用存储过程 获取测温历史记录 + /// + /// 条码 + /// + public List QueryTemperatureHistory(string barCode) + { + return _temperatureHistoryRepository.QueryTemperatureHistory(barCode); } } } \ No newline at end of file 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 ec38a905..338a4254 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 5904500d..9e28fae2 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 @@ -ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542 +41f96c06a6699d16272c9fa5c9313083b66b4d92c03c2e18edcec976d22fe73a 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 19486c3e..8cc143a5 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 @@ -9,3 +9,5 @@ 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 = 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 83f017e2..f70da939 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")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] [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 a5578479..e627c485 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 @@ -da4240456d30e56fa6c5e71babf5565adb3e1436 +b257f613a7d6a7d318c3b07b1b243b35b2419d441e95c4ece51dc9f3c406b9c8 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 d114eba8..88638f9a 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 @@ -9,3 +9,5 @@ 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 = diff --git a/Admin.Core.sln b/Admin.Core.sln index 0128c93f..73746949 100644 --- a/Admin.Core.sln +++ b/Admin.Core.sln @@ -85,9 +85,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.HwPLc", "Aucma.C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucam.Core.TemperatureService", "Aucam.Core.TemperatureService\Aucam.Core.TemperatureService.csproj", "{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aucma.Core.PrintTo", "Aucma.Core.PrintTo\Aucma.Core.PrintTo.csproj", "{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PrintTo", "Aucma.Core.PrintTo\Aucma.Core.PrintTo.csproj", "{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aucma.Core.SheetMetalTasks", "Aucma.Core.SheetMetalTasks\Aucma.Core.SheetMetalTasks.csproj", "{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.SheetMetalTasks", "Aucma.Core.SheetMetalTasks\Aucma.Core.SheetMetalTasks.csproj", "{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aucma.Core.TemperatureTask", "Aucma.Core.TemperatureTask\Aucma.Core.TemperatureTask.csproj", "{F427E68F-100D-4136-8761-F2C9CB0E7940}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -223,6 +225,10 @@ Global {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Debug|Any CPU.Build.0 = Debug|Any CPU {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Release|Any CPU.ActiveCfg = Release|Any CPU {F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Release|Any CPU.Build.0 = Release|Any CPU + {F427E68F-100D-4136-8761-F2C9CB0E7940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F427E68F-100D-4136-8761-F2C9CB0E7940}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F427E68F-100D-4136-8761-F2C9CB0E7940}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F427E68F-100D-4136-8761-F2C9CB0E7940}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -263,6 +269,7 @@ Global {87B08C88-4258-4D57-B9E5-EC6C7F3899BC} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A} {AC2B98A8-09CF-42A5-93B5-DF74185B8D3A} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3} {F78F41F3-8B38-4CA1-A254-C18CCDCA8291} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} + {F427E68F-100D-4136-8761-F2C9CB0E7940} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8047AB56-042B-4AE4-B06A-34137067A86A} diff --git a/Aucam.Core.TemperatureService/Aucam.Core.TemperatureService.csproj b/Aucam.Core.TemperatureService/Aucam.Core.TemperatureService.csproj index 0af4424c..db09931c 100644 --- a/Aucam.Core.TemperatureService/Aucam.Core.TemperatureService.csproj +++ b/Aucam.Core.TemperatureService/Aucam.Core.TemperatureService.csproj @@ -37,4 +37,8 @@ + + + + diff --git a/Aucam.Core.TemperatureService/Startup.cs b/Aucam.Core.TemperatureService/Startup.cs index 2f2bb1cb..b1ebefb8 100644 --- a/Aucam.Core.TemperatureService/Startup.cs +++ b/Aucam.Core.TemperatureService/Startup.cs @@ -1,9 +1,11 @@ using Admin.Core.Common; using Admin.Core.Extensions; +using Admin.Core.Extensions.Middlewares; using Admin.Core.IService.ISys; using Admin.Core.Tasks; using Aucma.Core.RunPlc; using Aucma.Core.Tasks; +using Aucma.Core.TemperatureTask; using Autofac; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -57,8 +59,8 @@ namespace Aucam.Core.TemperatureService //עҵ AddServices(services); - // - services.AddJobSetup(); + //¶ȡ + services.AddTemperatureTaskSetup(); //ֱ֧ȫ :֧ System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030") Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); @@ -80,15 +82,12 @@ namespace Aucam.Core.TemperatureService /// /// /// - public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, - ISchedulerCenter schedulerCenter) + public void Configure(IApplicationBuilder app, IAucamTemperatureMeasurementService aucamTemperatureMeasurementService) { // ʹþ̬ļ app.UseStaticFiles(); - // ȻȨм - //app.UseAuthorization(); - // QuartzNetJobȷ - app.UseQuartzJobMildd(tasksQzService, schedulerCenter); + // ע¶ȡм + app.UseTemperatureTaskMildds(aucamTemperatureMeasurementService); } diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs index 2bca1562..6331d804 100644 --- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs +++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs @@ -6,9 +6,11 @@ using Aucma.Core.HwPLc; using Aucma.Core.Scanner; using log4net; using Microsoft.Extensions.DependencyInjection; +using StackExchange.Profiling.Internal; using System; using System.Collections.Generic; using System.Linq; +using System.Printing; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -31,102 +33,171 @@ namespace Aucma.Core.Palletiz.Business } #endregion + + #region 初始化对象 + private readonly IBaseSpaceInfoServices? _baseSpaceInfoServices; + private readonly ICodeBindingRecordServices? _codeBindingServices; + private readonly IRecordInStoreServices? _recordInstoreServices; + #endregion + + public InstoreBusiness() + { + _baseSpaceInfoServices = App.ServiceProvider.GetService(); + _codeBindingServices = App.ServiceProvider.GetService(); + _recordInstoreServices = App.ServiceProvider.GetService(); + MvCodeHelper.HandlePalletizDelegateEvent += ScannerInStore;//注册扫码器扫码后业务处理事件 + } + + #region 接口引用 + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(InstoreBusiness)); + + + #endregion + #region 变量定义 public readonly List allScanners = Appsettings.app("ScannerServer").ToList(); public readonly string storeCodeA = Appsettings.app("StoreInfo", "PalletizStoreCodeA");//分垛库A public readonly string storeCodeB = Appsettings.app("StoreInfo", "PalletizStoreCodeB");//分垛库B + private static bool flagA = true; + private static bool flagB = true; + #endregion + + #region 事件 + + #region 更新提醒信息 + /// + /// 日志事件 + /// + public delegate void LogInStoreInfoDelegate(string message, string color); + public static event LogInStoreInfoDelegate LogInStoreInfoDelegateEvent; + #endregion + + #region 更新扫码信息 + /// + /// 刷新扫码信息——图表和表格 + /// + public delegate void ResherStoreInfoDelegate(); + public static event ResherStoreInfoDelegate ResherStoreInfoDelegateEvent; #endregion - #region 接口引用 - private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(InstoreBusiness)); - private readonly IBaseSpaceInfoServices? _baseSpaceInfoServices = App.ServiceProvider.GetService(); - private readonly ICodeBindingRecordServices? _codeBindingServices = App.ServiceProvider.GetService(); - private readonly IRecordInStoreServices? _recordInstoreServices = App.ServiceProvider.GetService(); #endregion + + + #region Test + [Obsolete("正式环境下使用ScannerInStore(string SNCode,string IP)")] public void test() { - // B240101 8302501416 0001 SN:16160030000000910999 + // B240101 8302501416 0001 SN:16160030000000910999 Task.Run(async () => { Thread.Sleep(3000); await InStore("16160030000000910999", "192.168.1.19"); }); + } + #endregion + + #region 扫码入库 + + /// + /// 扫码入库 + /// + /// 成品码 + /// 扫码器IP + public void ScannerInStore(string SNCode,string IP) + { + Task.Run(async () => + { + Thread.Sleep(3000); + await InStore(SNCode, IP); + }); } + + #endregion + #region 扫码入库处理 /// - /// + /// 扫码入库处理 /// /// 成品码 /// 扫码器ip /// - public async Task InStore(string SNCode,string scannerIp) + public async Task InStore(string SNCode, string scannerIp) { + Console.WriteLine($"上位机接收到扫码器传入的成品码:{SNCode};扫码器IP:{scannerIp}"); + LogInStoreInfoDelegateEvent?.Invoke($"上位机接收到扫码器传入的成品码:{SNCode};扫码器IP:{scannerIp}","White"); + bool plcResult = false;// plc下发结果 + List spaceNumList = new List();// 下发plc的货道号 + RecordInStore recordInstore = new RecordInStore();// 入库记录 try - { + { // 刷新页面 - List allScanners = Appsettings.app("ScannerServer").ToList(); - ScannerModel model = allScanners.FirstOrDefault(x => x.Ip == scannerIp); - // plc下发结果 - bool plcResult = false; - // 下发plc的货道号 - List spaceNumList = new List(); - // 入库记录 - RecordInStore recordInstore = new RecordInStore(); - + ScannerModel model = allScanners.First(x => x.Ip == scannerIp); + Console.WriteLine($"上位机获取配置的扫码器【IP:{model.ToJson()}》名称：{model.Name}】"); + LogInStoreInfoDelegateEvent?.Invoke($"上位机获取配置的扫码器【IP:{model.ToJson()}》名称：{model.Name}】","White"); //1.根据成品码找货道 - List spaceList = getSpaceBySNCode(SNCode,recordInstore); + List? spaceList = GetSpaceBySNCode(SNCode, recordInstore); + Console.WriteLine($"上位机获取配置的货道数量【{spaceList.Count}】"); + // 根据货道信息判断下发plc信号 - if (spaceList == null || spaceList.Count==0) + if (spaceList == null || spaceList.Count == 0) { logHelper.Error("未找到匹配货道，请手动入库!"); // 刷新页面提示信息 Console.WriteLine("未找到匹配货道，请手动入库!"); + LogInStoreInfoDelegateEvent?.Invoke("未找到匹配货道，请手动入库!", "White"); return; } // 过滤货道，找到最终需要下发的货道 BaseSpaceInfo finalSpace = FilterSpace(spaceList); - + Console.WriteLine($"上位机获取需要下发的货道【货道名称：{finalSpace.SpaceName}》货道库存：{finalSpace.SpaceStock}》货道状态：{finalSpace.SpaceStatus}》货道类型：{finalSpace.SpaceType}》所属仓库：{finalSpace.StoreCode}】"); + LogInStoreInfoDelegateEvent?.Invoke($"是否为大产品：【{finalSpace.IsTwoSpace}】", "White"); + Console.WriteLine($"是否为大产品：【{finalSpace.IsTwoSpace}】"); + LogInStoreInfoDelegateEvent?.Invoke($"下发的货道：【货道名称：{finalSpace.SpaceName}", "White"); // 大产品占两道 if (finalSpace.IsTwoSpace == 1) { spaceNumList.Add(int.Parse(finalSpace.SpaceCode.Substring(5, 3))); - spaceNumList.Add(int.Parse(getOtherSpace(finalSpace, spaceList).SpaceCode.Substring(5, 3))); - plcResult = sendAndAnswerPlc(scannerIp, spaceList[0].RotationRange, spaceNumList); + spaceNumList.Add(int.Parse(GetOtherSpace(finalSpace, spaceList).SpaceCode.Substring(5, 3))); + plcResult = SendAndAnswerPlc(scannerIp, spaceList[0].RotationRange, spaceNumList); recordInstore.SpaceCode = finalSpace.SpaceCode; recordInstore.StoreCode = finalSpace.StoreCode; // 更新货道信息,大产品last存objId大的，储存上一个货道的主键 如货道7,8存8 - BaseSpaceInfo otherSpace = getOtherSpace(finalSpace, spaceList); + BaseSpaceInfo otherSpace = GetOtherSpace(finalSpace, spaceList); + Console.WriteLine($"大产品入库信息：【{finalSpace.ToJson()}】【{spaceList.ToJson()}】"); if (otherSpace != null) { - updateSapceList(otherSpace.ObjId,spaceList); + UpdateSapceList(otherSpace.ObjId, spaceList); Console.WriteLine("更新货道信息成功!"); + LogInStoreInfoDelegateEvent?.Invoke("更新货道信息成功!", "White"); } } else { // last不等于自己，可以先入自己，否则入另一条货道 - if (isOddNumber(finalSpace)) + if (IsOddNumber(finalSpace)) { spaceNumList.Add(int.Parse(finalSpace.SpaceCode.Substring(5, 3))); spaceNumList.Add(0); - plcResult = sendAndAnswerPlc(scannerIp, finalSpace.RotationRange, spaceNumList); - updateSapceList(finalSpace.ObjId, spaceList); + plcResult = SendAndAnswerPlc(scannerIp, finalSpace.RotationRange, spaceNumList); + UpdateSapceList(finalSpace.ObjId, spaceList); Console.WriteLine("更新货道信息成功!"); + LogInStoreInfoDelegateEvent?.Invoke("更新货道信息成功!", "White"); } else { spaceNumList.Add(0); spaceNumList.Add(int.Parse(finalSpace.SpaceCode.Substring(5, 3))); - plcResult = sendAndAnswerPlc(scannerIp, finalSpace.RotationRange, spaceNumList); - updateSapceList(finalSpace.ObjId, spaceList); + plcResult = SendAndAnswerPlc(scannerIp, finalSpace.RotationRange, spaceNumList);//给PLC下传入库信号 + UpdateSapceList(finalSpace.ObjId, spaceList); Console.WriteLine("更新货道信息成功!"); + LogInStoreInfoDelegateEvent?.Invoke("更新货道信息成功!", "White"); } } - if (plcResult==true) + if (plcResult == true) { // 更新入库记录，刷新界面 #region 添加入库记录 @@ -136,13 +207,15 @@ namespace Aucma.Core.Palletiz.Business recordInstore.InStoreTime = DateTime.Now; recordInstore.CreatedTime = DateTime.Now; recordInstore.UpdateTime = DateTime.Now; - _ = _recordInstoreServices.AddAsync(recordInstore).Result; + await _recordInstoreServices.AddAsync(recordInstore); + #endregion } else { // 界面提示手动入库 + LogInStoreInfoDelegateEvent?.Invoke("界面提示手动入库!", "Red"); } } @@ -152,55 +225,68 @@ namespace Aucma.Core.Palletiz.Business return; } } - + + #region 根据成品码找货道 /// /// 根据成品码找货道 /// /// /// - private List getSpaceBySNCode(string SNCode, RecordInStore recordInstore) + private List? GetSpaceBySNCode(string SNCode, RecordInStore recordInstore) { try - { - CodeBindingRecord bindingRecord = _codeBindingServices.Query(c => c.ProductCode.Equals(SNCode)).FirstOrDefault(); - if (bindingRecord == null) return null; + { + CodeBindingRecord bindingRecord = _codeBindingServices.FirstAsync(c => c.ProductCode.Equals(SNCode)).Result; + + if (bindingRecord == null) return null; - recordInstore.BarCodeCode = bindingRecord.BoxCode; recordInstore.MaterialCode = bindingRecord.BoxCode; - recordInstore.MaterialType = bindingRecord.BoxCode.Substring(7, 10); + recordInstore.MaterialType = bindingRecord.BoxCode.Substring(7, 10); recordInstore.MaterialName = bindingRecord.BoxName; + string mType = bindingRecord.BoxCode.Substring(7, 10); + List bsInfo = _baseSpaceInfoServices.Query(s => (s.MaterialType.Equals(mType) && (s.StoreCode.Equals(storeCodeA)) || s.StoreCode.Equals(storeCodeB))); - return _baseSpaceInfoServices.Query(s => s.MaterialType.Equals(bindingRecord.BoxCode.Substring(7, 10)) && (s.StoreCode.Equals(storeCodeA) || s.StoreCode.Equals(storeCodeB)) ).OrderBy(x=>x.ObjId).ToList(); + if (bsInfo.Count > 0) + return bsInfo.OrderBy(x => x.ObjId).ToList(); + else + return null; } catch (Exception ex) { logHelper.Error(ex.Message.ToString()); + + Console.WriteLine(ex.Message.ToString()); return null; } } + #endregion + private BaseSpaceInfo FilterSpace(List spaceInfos) { - if (spaceInfos.Count == 1 || string.IsNullOrEmpty(spaceInfos[0].LastSpace)) + BaseSpaceInfo spaceInfo = spaceInfos.First(); + + if (spaceInfos.Count == 1 || string.IsNullOrEmpty(spaceInfo.LastSpace)) { - return spaceInfos[0]; + return spaceInfo; } - List spaceList = spaceInfos.Where(s=>s.ObjId> int.Parse(spaceInfos[0].LastSpace)).ToList(); - if(spaceList==null|| spaceList.Count == 0) + List spaceList = spaceInfos.Where(s => s.ObjId > int.Parse(spaceInfo.LastSpace)).ToList(); + if (spaceList == null || spaceList.Count == 0) { - return spaceInfos[0]; + return spaceInfo; } else { - return spaceList[0]; + return spaceInfo; } } + /// /// 大产品占据两条货道，根据一条货道找到另一条货道 /// /// - private BaseSpaceInfo getOtherSpace(BaseSpaceInfo spaceInfo,List spaceList) + private BaseSpaceInfo GetOtherSpace(BaseSpaceInfo spaceInfo, List spaceList) { try { @@ -228,18 +314,20 @@ namespace Aucma.Core.Palletiz.Business catch (Exception ex) { logHelper.Error(ex.Message.ToString()); + Console.WriteLine($"大产品根据一条货道找到另一条货道异常：{ex.Message}"); return null; } } + /// /// 判断货道编号是否为奇数 /// /// /// - private bool isOddNumber(BaseSpaceInfo space) + private bool IsOddNumber(BaseSpaceInfo space) { int num = int.Parse(space.SpaceCode.Substring(5, 3)); - if(num % 2 == 0) + if (num % 2 == 0) { return false; } @@ -248,25 +336,27 @@ namespace Aucma.Core.Palletiz.Business return true; } } - - + + /// /// 将该物料的所有货道列表的last修改为上次入库货道objId /// /// /// /// - private bool updateSapceList(int objId,List spaceList) + private bool UpdateSapceList(int objId, List spaceList) { - foreach(BaseSpaceInfo space in spaceList) + foreach (BaseSpaceInfo space in spaceList) { space.LastSpace = objId.ToString(); } - return _baseSpaceInfoServices.UpdateAsync(spaceList).Result; + return _baseSpaceInfoServices.UpdateAsync(spaceList).Result; } #endregion #region plc信号下发 + + #region 下发plc入库信号 /// /// 下发plc入库信号 /// @@ -274,17 +364,17 @@ namespace Aucma.Core.Palletiz.Business /// 转向角度 /// 货道号int集合 /// - private bool sendAndAnswerPlc(string scannerIp,int range,List spaceNum) + private bool SendAndAnswerPlc(string scannerIp, int range, List spaceNum) { bool result = false; try { - PlcModel obj = getPlcByScanner(scannerIp); + PlcModel obj = GetPlcByScanner(scannerIp); if (obj != null) { - if (sendPlc(obj, range, spaceNum)) + if (SendPlc(obj, range, spaceNum)) { - result = waitAnswerPlc(obj); + result = WaitAnswerPlc(obj); } } else @@ -300,7 +390,11 @@ namespace Aucma.Core.Palletiz.Business logHelper.Error(ex.Message.ToString()); return result; } - } + } + #endregion + + #region 下发plc信号 + /// /// 下发plc信号 /// @@ -308,7 +402,7 @@ namespace Aucma.Core.Palletiz.Business /// /// /// - private bool sendPlc(PlcModel obj, int range, List spaceNum) + private bool SendPlc(PlcModel obj, int range, List spaceNum) { try { @@ -320,16 +414,18 @@ namespace Aucma.Core.Palletiz.Business if (DateTime.Now > targetTime) // plc超最大时限无反馈 { logHelper.Error("等待plc放行反馈信号超时"); + Console.WriteLine("等待plc放行反馈信号超时"); return false; } // 应答字允许下发 + Console.WriteLine($"读取应答字是否下传成功！【{obj.plc.ReadInt32("D102")}】"); if (obj.plc.ReadInt32("D102") == 1) { - //旋转角度 - obj.plc.WriteInt32("D110", range); - //货道号 - obj.plc.WriteInt32("D112", spaceNum[0]); - obj.plc.WriteInt32("D114", spaceNum[1]); + //obj.plc.WriteInt32("D110", range);//旋转角度暂时不赋值由PLC转向 + + obj.plc.WriteInt32("D112", spaceNum[0]); //货道号 + obj.plc.WriteInt32("D114", spaceNum[1]); //货道号 + Console.WriteLine($"plc信号货道信号下发成功!【D112:{spaceNum[0]}】D114:{spaceNum[1]}"); result = true; break; } @@ -343,12 +439,16 @@ namespace Aucma.Core.Palletiz.Business return false; } } + + #endregion + + #region 等待plc信号反馈 /// /// 等待plc信号反馈 /// /// /// - private bool waitAnswerPlc(PlcModel obj) + private bool WaitAnswerPlc(PlcModel obj) { try { @@ -380,24 +480,104 @@ namespace Aucma.Core.Palletiz.Business } } + #endregion + + #region 根据扫码器ip确定是属于哪个plc /// /// 根据扫码器ip确定是属于哪个plc /// /// /// - private PlcModel getPlcByScanner(string scannerIp) + private PlcModel GetPlcByScanner(string scannerIp) { PlcModel obj = null; ScannerModel model = allScanners.FirstOrDefault(x => x.Ip == scannerIp); if (model.Id < 3) { - obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("A库Plc")); + obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreAPlc")); } else { - obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("B库Plc")); + obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreBPlc")); } return obj; + } + #endregion + + #endregion + + #region 手动写入货道号给PLC数据 + /// + /// 手动写入PLC数据 + /// + /// + public static bool WritePlc(Models.StackInfoModel tempStackInfo) + { + var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStorePlc")); + //写入PLC + if (obj.plc.IsConnected) + { + //1、判断是否为大产品、占用两个货道 上位机两条道设置为相同型号 + if (tempStackInfo.IsLargeProducts) + { + obj.plc.WriteInt16("D7000", tempStackInfo.BinNo.ToString());//写入货道 + obj.plc.WriteInt16("D7100", tempStackInfo.BinNo.ToString());//写入货道 + } + else + { + //判断入库货道 + if (tempStackInfo.BinNo / 2 == 0) + { + obj.plc.WriteInt16("D7000", tempStackInfo.BinNo.ToString());//写入货道 + obj.plc.WriteInt16("D7100", "0");//写入货道 + } + else + { + obj.plc.WriteInt16("D7000", "0");//写入货道 + obj.plc.WriteInt16("D7100", tempStackInfo.BinNo.ToString());//写入货道 + } + } + obj.plc.WriteInt16("D7020", "1");//同时写入应答字 + Console.WriteLine("手动写入PLC成功！"); + do + { + #region 1号区域码垛——A + int responseWord1 = obj.plc.ReadInt16("D7020");//读取1号区域码垛 等待应答字回去 + Console.WriteLine($"获取应答信号：{responseWord1}"); + if (responseWord1 == 2) + { + //清空货道 + obj.plc.WriteInt16("D7000", "0"); + obj.plc.WriteInt16("D7100", "0"); + flagA = false; + } + #endregion + } while (flagA); + } + //更新货道 + return false; + } + + private static void GetResposeB() + { + var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStorePlc")); + //写入PLC + if (obj.plc.IsConnected) + { + do + { + + #region 2号区域码垛——B + int responseWord2 = obj.plc.ReadInt16("D7120");//读取1号区域码垛 等待应答字回去 + Console.WriteLine("手动写入PLC成功！"); + if (responseWord2 == 2) + { + obj.plc.WriteInt16("D7000", "0");//清空 + } + #endregion + + } while (flagA); + } } #endregion } diff --git a/Aucma.Core.Palletiz/Models/StackInfoModel.cs b/Aucma.Core.Palletiz/Models/StackInfoModel.cs index 66df93b8..9d9312fe 100644 --- a/Aucma.Core.Palletiz/Models/StackInfoModel.cs +++ b/Aucma.Core.Palletiz/Models/StackInfoModel.cs @@ -11,9 +11,20 @@ namespace Aucma.Core.Palletiz.Models /// public class StackInfoModel { + /// + /// 成品码 + /// + public string? SNCode { get; set; } public int LevelNo { get; set; } public int BinNo { get; set; } public int PortNo { get; set; } + /// + /// 范围 + /// public int RangeNo { get; set; } + /// + /// 是否为大产品 + /// + public bool IsLargeProducts { get; set; } } } diff --git a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs index 57911f84..463f248a 100644 --- a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs @@ -1,4 +1,5 @@ -using Aucma.Core.Palletiz.Models; +using Aucma.Core.Palletiz.Business; +using Aucma.Core.Palletiz.Models; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using log4net; @@ -18,10 +19,11 @@ namespace Aucma.Core.Palletiz.ViewModels private int RangeNo = 1; #endregion - public static StackInfoModel TempStackInfo = new StackInfoModel(); - + public static StackInfoModel tempStackInfo = new StackInfoModel(); + public HandPalletizViewModel() { - PromptInfo("请选择信息下传......", "White"); + + PromptInfo("请选择信息下传......", "White"); } #region 分垛信息下传 @@ -31,34 +33,41 @@ namespace Aucma.Core.Palletiz.ViewModels [RelayCommand] public void Save() { - PromptInfo("分垛信息下传中......", "White"); - DialogResult cr = MessageBox.Show("是否确认下传分垛信息?", "系统提醒", MessageBoxButtons.OKCancel); - if (cr != DialogResult.OK) + try { - return; - } - TempStackInfo.LevelNo = LevelNo; - TempStackInfo.BinNo = (BinNo - 1) * 2 + PortNo + ((LevelNo - 1) * 10); - TempStackInfo.PortNo = PortNo; - TempStackInfo.RangeNo = RangeNo; + PromptInfo("分垛信息下传中......", "White"); + DialogResult cr = MessageBox.Show("是否确认下传分垛信息?", "系统提醒", MessageBoxButtons.OKCancel); + if (cr != DialogResult.OK) + { + return; + } + tempStackInfo.LevelNo = LevelNo; + tempStackInfo.BinNo = (BinNo - 1) * 2 + PortNo + ((LevelNo - 1) * 10); + tempStackInfo.PortNo = PortNo; + tempStackInfo.RangeNo = RangeNo; - bool backResult = true;// ControlStackingScan.DownLoadInInfo(TempStackInfo); - if (backResult) - { - PromptInfo("分垛信息下传成功！", "White"); + bool backResult = InstoreBusiness.WritePlc(tempStackInfo); + if (backResult) + { + PromptInfo("分垛信息下传成功！", "White"); + } + else + { + PromptInfo("分垛信息下传失败！", "Red"); + } } - else + catch (Exception ex) { - PromptInfo("分垛信息下传失败！", "Red"); + PromptInfo($"分垛信息下传失败:{ex.Message}", "Red"); } } #endregion #region 提示信息 - private string msgTxt; + private string? msgTxt; - public string MsgTxt + public string? MsgTxt { get => msgTxt; set => SetProperty(ref msgTxt, value); diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs index f994e95b..fb0f4453 100644 --- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs @@ -11,27 +11,30 @@ using Aucma.Core.Palletiz.Business; using Admin.Core.Model; using System.Windows.Documents; using System.Windows.Interop; +using Admin.Core.Common; /* * 成品分垛入库首页信息 - * + * 2024-02-28 */ namespace Aucma.Core.Palletiz.ViewModels { public partial class IndexPageViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel)); + private InstoreBusiness inStoreBusiness = InstoreBusiness.Instance;//初始化业务执行类 public IndexPageViewModel() { - //StationName = "成品分垛入库"; + StationName = Appsettings.app("StoreInfo", "StationName");//分垛库A //MaterialName = "SC-AUCMA-农夫山泉，SC"; //OrderNo = "8512365486"; //BeginTime = DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss"); TotalEnterStoreNum = 0; - InitEveryDayMethod(); - MsgInfo = "提示信息"; - //ControlStackingScan.HandPalletizDelegateEvent += PromptInfo; + PromptInfo("提示信息","White"); + InstoreBusiness.LogInStoreInfoDelegateEvent += PromptInfo;//成品入库提示信息 + + InitEveryDayMethod();//图表信息初始化 } #region 扫描信息 diff --git a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml index 0cb70e5e..d89c4d8c 100644 --- a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml +++ b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml @@ -31,57 +31,48 @@ + - - - + + - - - - - - - - + + - + - - - +