diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 4d660a64..2ccd98d3 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -1841,6 +1841,51 @@ 记录时间 + + + 门体发泡记录 + + + + + 主键 + + + + + 台车编号 + + + + + 枪号 + + + + + 模位状态;0=>不工作,1=>A门工作；2=>B门工作;3=>AB门工作 + + + + + 模位类型 + + + + + 模具产量A + + + + + 模具产量B + + + + + 创建时间 + + 门体发泡记录 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 0a98b80a..fe5e8758 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 @@ -1,41 +1,46 @@ { "format": 1, "restore": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -78,36 +83,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -263,36 +273,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -332,60 +347,65 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "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" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" } } } @@ -421,39 +441,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -483,39 +508,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -545,36 +575,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -604,36 +639,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -663,29 +703,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -748,42 +793,47 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "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" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -813,48 +863,53 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -890,29 +945,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -951,29 +1011,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1012,39 +1077,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1074,36 +1144,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1139,36 +1214,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1204,42 +1284,47 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "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" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1269,7 +1354,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\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..15920027 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 @@ -5,18 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + - C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file 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..d1d06cea 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 @@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules = 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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = 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 d57995ef..d8850da5 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 6f928a74..209a19d7 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -7052,12 +7052,11 @@ ] }, "System.Collections.NonGeneric/4.3.0": { - "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==", "type": "package", "path": "system.collections.nongeneric/4.3.0", "files": [ ".nupkg.metadata", - ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -9790,12 +9789,11 @@ ] }, "System.Runtime.Serialization.Primitives/4.3.0": { - "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==", "type": "package", "path": "system.runtime.serialization.primitives/4.3.0", "files": [ ".nupkg.metadata", - ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -11257,40 +11255,47 @@ ] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.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": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -11333,7 +11338,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index 66791f7b..c8cd40d1 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,233 +1,233 @@ { "version": 2, - "dgSpecHash": "ikzDviTkPCZihaCgfwo8AuzSJtovmijOXuLwxKtGKgxnoK/TUK28Ezke2gSYzzQArjgQtsTmEg3YwxUUY0FkCg==", + "dgSpecHash": "HsMojseCVmTxRPG4iGkEf/2OvAGUxYsYPY9resKB+wCYzU12wwdfiUulJ6iIYjBrrvQkt9KbYTYesAxpAJXRFg==", "success": true, - "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ - "C:\\Users\\admin\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", - "C:\\Users\\admin\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512" + "C:\\Users\\Lenovo\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", + "C:\\Users\\Lenovo\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512" ], "logs": [] } \ No newline at end of file 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..2f9c868b 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\ 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..0f098310 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\ 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..1fdeb046 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ 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..5decb385 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,3 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\ 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..968ed779 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\ diff --git a/Admin.Core.IService/IService_New/IDoorFoamMachineServices.cs b/Admin.Core.IService/IService_New/IDoorFoamMachineServices.cs new file mode 100644 index 00000000..790874dd --- /dev/null +++ b/Admin.Core.IService/IService_New/IDoorFoamMachineServices.cs @@ -0,0 +1,15 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.ViewModels; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// IDoorMateHistoryServices + /// + public interface IDoorFoamMachineServices : IBaseServices + { + } +} \ No newline at end of file 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..1e7c9f10 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ diff --git a/Admin.Core.Model/Model_New/DoorFoamMachine.cs b/Admin.Core.Model/Model_New/DoorFoamMachine.cs new file mode 100644 index 00000000..1bb0eb5f --- /dev/null +++ b/Admin.Core.Model/Model_New/DoorFoamMachine.cs @@ -0,0 +1,81 @@ +using NPOI.SS.Formula.Functions; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model +{ + /// + /// 门体发泡记录 + /// + [SugarTable("DOOR_FOAMREMACHINE", "AUCMA_SCADA")] + public class DoorFoamMachine + { + /// + /// 主键 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DOOR_FOAMREMACHINE")] + public int ObjId { get; set; } + + /// + /// 台车编号 + /// + [SugarColumn(ColumnName = "STATIONTROLLEYNUMBER")] + public int StationTrolleyNumber { get; set; } + + /// + /// 枪号 + /// + [SugarColumn(ColumnName = "GUNNUMBER")] + public int GunNumber { get; set; } + + /// + /// 模位状态;0=>不工作,1=>A门工作；2=>B门工作;3=>AB门工作 + /// + [SugarColumn(ColumnName = "MOLDSTATUS")] + public string MoldStatus { get; set; } + + [SugarColumn(ColumnName = "MOLDTYPEA")] + public string MoldType_A { get; set; } + + /// + /// 模位类型 + /// + [SugarColumn(ColumnName = "MOLDTYPEB")] + public string MoldType_B { get; set; } + + + /// + /// 模具产量A + /// + [SugarColumn(ColumnName = "MOLDPRODUCTIONA")] + public string MoldProdutionA { get; set; } + + /// + /// 模具产量B + /// + [SugarColumn(ColumnName = "MOLDPRODUCTIONB")] + public string MoldProdutionB { get; set; } + + [SugarColumn(ColumnName = "DEVICESTATUS")] + public int DeviceStatus { get;set; } + + [SugarColumn(ColumnName = "DEVICEALARM")] + public int DeviceAlarm { get; set; } + + [SugarColumn(ColumnName = "PRODUCTTAKT")] + public double ProductTakt { get; set; } + + [SugarColumn(ColumnName = "TAKT")] + public double Takt { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime? CreateTime { get; set; } + } +} 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..173f98e4 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ 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..abc27d01 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 @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\ 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..67886d71 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ 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..a3d7d5ba 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\ diff --git a/Admin.Core.Service/Service_New/DoorFoamMachineServices.cs b/Admin.Core.Service/Service_New/DoorFoamMachineServices.cs new file mode 100644 index 00000000..df469186 --- /dev/null +++ b/Admin.Core.Service/Service_New/DoorFoamMachineServices.cs @@ -0,0 +1,16 @@ +using Admin.Core.IRepository; +using Admin.Core.IService; +using Admin.Core.Model; + +namespace Admin.Core.Service +{ + public class DoorFoamMachineServices : BaseServices, IDoorFoamMachineServices + { + private readonly IBaseRepository _dal; + public DoorFoamMachineServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + } +} 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..9c6bffa2 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ 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..48679c0e 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,4 +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.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ diff --git a/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs b/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs index 2fc85f4e..bc826974 100644 --- a/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs +++ b/Aucma.Core.BoxFoam/Business/CollectionFoamMachine.cs @@ -4,7 +4,7 @@ using Admin.Core.Model; using Aucma.Core.BoxFoam.Models; using Aucma.Core.BoxFoam.ViewModels; using Aucma.Core.HwPLc; - +using Microsoft.Extensions.DependencyInjection; using NetTaste; using NPOI.Util; using System; @@ -15,6 +15,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Documents; +using System.Windows.Forms; namespace Aucma.Core.BoxFoam.Business { @@ -23,29 +24,116 @@ namespace Aucma.Core.BoxFoam.Business /// public class CollectionFoamMachine { + /// + /// 刷新最后一枪DATAGRID + /// + public delegate void RefreshLastShotDataDelegate(BoxLastShotRecord record); + public static event RefreshLastShotDataDelegate RefreshLastShotDataDelegateEvent; + + /// + /// 刷新每一枪数据 + /// + public delegate void RefreshGunDataDelegate(Dictionary keys); + public static event RefreshGunDataDelegate RefreshGunDataDelegateEvent; + + /// + /// 刷新系统数据 + /// + public delegate void RefreshSystemDataDelegate(Dictionary keys); + public static event RefreshSystemDataDelegate RefreshSystemDataDelegateEvent; + private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding(); List foamMachinesList = new List(); - private static BoxLastShotRecord tempLastRecord = null; - - public void startCollect() + + Dictionary gunKeys = new Dictionary(); + Dictionary tempKeys = new Dictionary(); + // 系统参数 + Dictionary systemKeys = new Dictionary(); + Semaphore semaphore = new Semaphore(1, 1); + + private readonly IBoxLastShotRecordServices? _lastShotRecordServices = App.ServiceProvider.GetService(); + + + public CollectionFoamMachine() + { + startCollect(); + } + + public void startCollect() { - Task.Run( () => + Task.Run(() => { - Task.Delay(2000); - - //Thread.Sleep(6000); - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamMachinePlc")); - if (obj != null) + while (true) { - ReadEquipSystem(obj, "DB50.388"); //采集1系统 - //ReadEquipSystem(obj, "DB50.642"); //采集2系统 - //ReadGunData(obj, "DB50.896"); //A1枪数据 - //ReadGunData(obj, "DB50.1084"); //A1枪数据 - //ReadGunData(obj, "DB50.1272"); //A1枪数据 - //ReadGunData(obj, "DB50.1460"); //A1枪数据 - + semaphore.WaitOne(); + try + { + Thread.Sleep(3000); + var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamMachinePlc")); + if (obj != null) + { + ReadEquipSystem(obj, "DB50.388", systemKeys, "1"); //采集1系统 + ReadEquipSystem(obj, "DB50.642", systemKeys, "2"); //采集2系统 + + ReadGunData(obj, "DB50.896", gunKeys, "A1"); //A1枪数据 + ReadGunData(obj, "DB50.1084", gunKeys, "B1"); //B1枪数据 + ReadGunData(obj, "DB50.1272", gunKeys, "A2"); //A2枪数据 + ReadGunData(obj, "DB50.1460", gunKeys, "B2"); //A2枪数据 + RefreshSystemDataDelegateEvent?.Invoke(systemKeys); + RefreshGunDataDelegateEvent?.Invoke(gunKeys); + + + foreach (KeyValuePair kvPair in gunKeys) + { + //程序启动缓存没数据查数据库 + if (!tempKeys.ContainsKey(kvPair.Key)) + { + BoxLastShotRecord record = _lastShotRecordServices.Query(x => x.System == kvPair.Value.System && x.ProductLineCode == kvPair.Value.ProductLineCode && x.GunCode == kvPair.Value.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault(); + if (record == null) + { + // 数据库也没数据 + int a = _lastShotRecordServices.AddAsync(kvPair.Value).Result; + RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value); + continue; + } + tempKeys.Add(kvPair.Key, record); + } + if (!kvPair.Value.MixpistOff.Equals(tempKeys[kvPair.Key].MixpistOff)) + { + int b = _lastShotRecordServices.AddAsync(kvPair.Value).Result; + RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value); + } + + + } + } + + } + catch (Exception ex) + { + Console.WriteLine(ex); + } + finally + { + + foreach (KeyValuePair kvp in gunKeys) + { + if (tempKeys.ContainsKey(kvp.Key)) + { + // 键已存在，更新值 + tempKeys[kvp.Key] = kvp.Value; + } + else + { + // 键不存在，添加键值对 + tempKeys.Add(kvp.Key, kvp.Value); + } + } + // tempKeys = gunKeys; + semaphore.Release(); + } } - + }); } @@ -53,38 +141,54 @@ namespace Aucma.Core.BoxFoam.Business /// 采集设备系统参数 /// /// - static void ReadEquipSystem(HwPLc.PlcModel obj, string startStr) + static void ReadEquipSystem(HwPLc.PlcModel obj, string startStr, Dictionary keys, string systemId) { - if (obj == null && !obj.plc.IsConnected) return; + if (obj == null || !obj.plc.IsConnected) return; if (obj.plc.IsConnected) { - FoamMachinesModel mode=new FoamMachinesModel(); + byte[] info = obj.plc.Read(startStr, 170); - int temp1 = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray())); - int temp2 = judgeStatus(ByteArrayToBinary(info.Skip(1).Take(1).ToArray())); - float temp3 = byteToFloat(info.Skip(2).Take(4).ToArray()); - - float temp4 = byteToFloat(info.Skip(14).Take(4).ToArray()); - float temp5 = byteToFloat(info.Skip(18).Take(4).ToArray()); - float temp6 = byteToFloat(info.Skip(22).Take(4).ToArray()); + if (info == null) return; + FoamMachinesModel model = new FoamMachinesModel(); + model.systemId = systemId; + + model.Machine_Status_0 = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray())).ToString(); + model.Machine_Status_1 = judgeStatus(ByteArrayToBinary(info.Skip(1).Take(1).ToArray())).ToString(); + model.POL_Level = byteToFloat(info.Skip(2).Take(4).ToArray()).ToString(); - float temp7 = byteToFloat(info.Skip(34).Take(4).ToArray()); - float temp8 = byteToFloat(info.Skip(38).Take(4).ToArray()); - float temp9 = byteToFloat(info.Skip(42).Take(4).ToArray()); + model.POL_Temp = byteToFloat(info.Skip(14).Take(4).ToArray()).ToString(); + model.POL_LP = byteToFloat(info.Skip(18).Take(4).ToArray()).ToString(); + model.POL_HP = byteToFloat(info.Skip(22).Take(4).ToArray()).ToString(); - float temp10 = byteToFloat(info.Skip(82).Take(4).ToArray()); + model.POL_Vol = byteToFloat(info.Skip(34).Take(4).ToArray()).ToString(); + model.POL_Usage = byteToFloat(info.Skip(38).Take(4).ToArray()).ToString(); + model.POL_Freq_Speed = byteToFloat(info.Skip(42).Take(4).ToArray()).ToString(); - float temp11 = byteToFloat(info.Skip(94).Take(4).ToArray()); - float temp12 = byteToFloat(info.Skip(98).Take(4).ToArray()); - float temp13 = byteToFloat(info.Skip(102).Take(4).ToArray()); + model.ISO_Level = byteToFloat(info.Skip(82).Take(4).ToArray()).ToString(); - float temp14 = byteToFloat(info.Skip(114).Take(4).ToArray()); - float temp15 = byteToFloat(info.Skip(118).Take(4).ToArray()); - float temp16 = byteToFloat(info.Skip(122).Take(4).ToArray()); + model.ISO_Temp = byteToFloat(info.Skip(94).Take(4).ToArray()).ToString(); + model.ISO_LP = byteToFloat(info.Skip(98).Take(4).ToArray()).ToString(); + model.ISO_HP = byteToFloat(info.Skip(102).Take(4).ToArray()).ToString(); - float temp17 = byteToFloat(info.Skip(162).Take(4).ToArray()); - float temp18 = byteToFloat(info.Skip(166).Take(4).ToArray()); + model.ISO_Vol = byteToFloat(info.Skip(114).Take(4).ToArray()).ToString(); + model.ISO_Usage = byteToFloat(info.Skip(118).Take(4).ToArray()).ToString(); + model.ISO_Freq_Speed = byteToFloat(info.Skip(122).Take(4).ToArray()).ToString(); + model.Hydr_Press = byteToFloat(info.Skip(162).Take(4).ToArray()).ToString(); + model.Hydr_Temp = byteToFloat(info.Skip(166).Take(4).ToArray()).ToString(); + + model.collectTime = DateTime.Now; + + if (keys.ContainsKey(systemId)) + { + // 键已存在，更新值 + keys[systemId] = model; + } + else + { + // 键不存在，添加键值对 + keys.Add(systemId, model); + } } } @@ -92,98 +196,57 @@ namespace Aucma.Core.BoxFoam.Business /// 每一枪数据 ---A1,B1,A2,B2 /// /// - static void ReadGunData(HwPLc.PlcModel obj, string startStr) + static void ReadGunData(HwPLc.PlcModel obj, string startStr, Dictionary keys, string gunCode) { - if (obj == null && !obj.plc.IsConnected) return; + if (obj == null || !obj.plc.IsConnected) return; if (obj.plc.IsConnected) { - byte[] info = obj.plc.Read(startStr, 88); - - float temp1 = byteToFloat(info.Skip(0).Take(4).ToArray()); - float temp2 = byteToFloat(info.Skip(4).Take(4).ToArray()); - float temp3 = byteToFloat(info.Skip(8).Take(4).ToArray()); - float temp4 = byteToFloat(info.Skip(12).Take(4).ToArray()); - float temp5 = byteToFloat(info.Skip(16).Take(4).ToArray()); - float temp6 = byteToFloat(info.Skip(20).Take(4).ToArray()); - float temp7 = byteToFloat(info.Skip(24).Take(4).ToArray()); - float temp8 = byteToFloat(info.Skip(28).Take(4).ToArray()); - - short temp9 = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - int temp10 = int.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - float temp11 = byteToFloat(info.Skip(42).Take(4).ToArray()); - float temp12 = byteToFloat(info.Skip(46).Take(4).ToArray()); - float temp13 = byteToFloat(info.Skip(50).Take(4).ToArray()); - float temp14 = byteToFloat(info.Skip(54).Take(4).ToArray()); - int temp15 = int.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp16 = int.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - float temp17 = byteToFloat(info.Skip(66).Take(4).ToArray()); - float temp18 = byteToFloat(info.Skip(70).Take(4).ToArray()); - int temp19 = int.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp20 = int.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp21 = int.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - - int temp22 = judgeStatus(ByteArrayToBinary(info.Skip(87).Take(1).ToArray())); + if (info == null) return; + BoxLastShotRecord lastShotRecord = new BoxLastShotRecord(); + lastShotRecord.System = gunCode.Substring(1, 1); + lastShotRecord.GunCode = gunCode; + lastShotRecord.ProductLineCode = "CX_02"; + + lastShotRecord.PolTemp = byteToFloat(info.Skip(0).Take(4).ToArray()).ToString(); + lastShotRecord.PolHp = byteToFloat(info.Skip(4).Take(4).ToArray()).ToString(); + lastShotRecord.PolVol = byteToFloat(info.Skip(8).Take(4).ToArray()).ToString(); + lastShotRecord.PolUsage = byteToFloat(info.Skip(12).Take(4).ToArray()).ToString(); + lastShotRecord.IsoTemp = byteToFloat(info.Skip(16).Take(4).ToArray()).ToString(); + lastShotRecord.IsoHp = byteToFloat(info.Skip(20).Take(4).ToArray()).ToString(); + lastShotRecord.IsoVol = byteToFloat(info.Skip(24).Take(4).ToArray()).ToString(); + lastShotRecord.IsoUsage = byteToFloat(info.Skip(28).Take(4).ToArray()).ToString(); + + lastShotRecord.PourNu = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber).ToString(); + lastShotRecord.SetTime = int.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); + lastShotRecord.SetWeight = byteToFloat(info.Skip(42).Take(4).ToArray()).ToString(); + lastShotRecord.SetRatio = byteToFloat(info.Skip(46).Take(4).ToArray()).ToString(); ; + lastShotRecord.PourWeight = byteToFloat(info.Skip(50).Take(4).ToArray()).ToString(); + lastShotRecord.PourRatio = byteToFloat(info.Skip(54).Take(4).ToArray()).ToString(); + lastShotRecord.MpTime = int.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); + lastShotRecord.HpTime = int.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); + lastShotRecord.HydrPress = byteToFloat(info.Skip(66).Take(4).ToArray()).ToString(); + lastShotRecord.HydrTemp = byteToFloat(info.Skip(70).Take(4).ToArray()).ToString(); + lastShotRecord.MixpistOn = int.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); + lastShotRecord.MixpistOff = int.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); ; + lastShotRecord.TotalYield = int.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); ; + lastShotRecord.PourEnd = judgeStatus(ByteArrayToBinary(info.Skip(87).Take(1).ToArray())).ToString(); + + lastShotRecord.CreateTime = DateTime.Now; + + if (keys.ContainsKey(gunCode)) + { + // 键已存在，更新值 + keys[gunCode] = lastShotRecord; + } + else + { + // 键不存在，添加键值对 + keys.Add(gunCode, lastShotRecord); + } } } - ///// - ///// 采集最后一枪数据 - ///// - ///// - //public async Task CollectLast() - //{ - // var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("Plc1")); - // if (obj != null && obj.plc.IsConnected) - // { - // BoxLastShotRecord lastShotRecord = new BoxLastShotRecord(); - // byte[] info = obj.plc.ReadBytes("DB50.896", (ushort)88); - // IByteTransform byteTransform = new RegularByteTransform(); - - // lastShotRecord.System = "1"; - // lastShotRecord.GunCode = "A1"; - // lastShotRecord.GunCode = "A1"; - // #region 赋值 - // lastShotRecord.PolTemp = Encoding.ASCII.GetString(info.Skip(0).Take(4).ToArray()); - // lastShotRecord.PolHp = StringChange.bytesToHexStr(info.Skip(4).Take(4).ToArray(), 4); - // lastShotRecord.PolVol = StringChange.bytesToHexStr(info.Skip(8).Take(4).ToArray(), 4); - // lastShotRecord.PolUsage = StringChange.bytesToHexStr(info.Skip(12).Take(4).ToArray(), 4); - // lastShotRecord.IsoTemp = StringChange.bytesToHexStr(info.Skip(16).Take(4).ToArray(), 4); - // lastShotRecord.IsoHp = StringChange.bytesToHexStr(info.Skip(20).Take(4).ToArray(), 4); - // lastShotRecord.IsoVol = StringChange.bytesToHexStr(info.Skip(24).Take(4).ToArray(), 4); - // lastShotRecord.IsoUsage = StringChange.bytesToHexStr(info.Skip(28).Take(4).ToArray(), 4); - // lastShotRecord.PourNu = StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2); - // lastShotRecord.SetTime = StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4); - // lastShotRecord.SetWeight = StringChange.bytesToHexStr(info.Skip(42).Take(4).ToArray(), 4); - // lastShotRecord.SetRatio = StringChange.bytesToHexStr(info.Skip(46).Take(4).ToArray(), 4); - // lastShotRecord.PourWeight = StringChange.bytesToHexStr(info.Skip(50).Take(4).ToArray(), 4); - // lastShotRecord.PourRatio = StringChange.bytesToHexStr(info.Skip(54).Take(4).ToArray(), 4); - // lastShotRecord.MpTime = StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4); - // lastShotRecord.HpTime = StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4); - // lastShotRecord.HydrPress = StringChange.bytesToHexStr(info.Skip(66).Take(4).ToArray(), 4); - // lastShotRecord.HydrTemp = StringChange.bytesToHexStr(info.Skip(70).Take(4).ToArray(), 4); - // lastShotRecord.MixpistOn = StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4); - // lastShotRecord.MixpistOff = StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4); - // lastShotRecord.TotalYield = StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4); - // lastShotRecord.PourEnd = StringChange.bytesToHexStr(info.Skip(87).Take(1).ToArray(), 1); - // lastShotRecord.CreateTime = DateTime.Now; - // #endregion - - // //if (tempLastRecord == null) - // //{ - // // //数据库查 - // // tempLastRecord = _lastShotRecordServices.Query(x => x.System == lastShotRecord.System && x.ProductLineCode == lastShotRecord.ProductLineCode && x.GunCode == lastShotRecord.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault(); - // //} - // //if (tempLastRecord == null || !tempLastRecord.MixpistOff.Equals(lastShotRecord.MixpistOff)) - // //{ - // // // 刷新页面 - // // RefreshLastShotDataDelegateEvent?.Invoke(lastShotRecord); - // // //保存 - // // _lastShotRecordServices.AddAsync(lastShotRecord); - // // tempLastRecord = lastShotRecord; - // //} - // } - //} #region 字符工具转换方法 /// byte[]转十进制ascii码 diff --git a/Aucma.Core.BoxFoam/Models/FoamMachinesModel.cs b/Aucma.Core.BoxFoam/Models/FoamMachinesModel.cs index ae1c0e71..7cf2182c 100644 --- a/Aucma.Core.BoxFoam/Models/FoamMachinesModel.cs +++ b/Aucma.Core.BoxFoam/Models/FoamMachinesModel.cs @@ -12,299 +12,104 @@ namespace Aucma.Core.BoxFoam.Models { public partial class FoamMachinesModel { - #region 料位 /// - /// POL料位 + /// 系统编号;1系统 2系统 /// - public int Syst1_POLMaterialLevel { get; set; } + public string systemId { get; set; } /// - /// ISO料位 + /// 开关机信号 /// - public int Syst1_ISOMaterialLevel { get; set; } - #endregion + public string Machine_Status_0 { get; set; } - #region 温度 /// - /// Plo温度 + ///运行状态（自/手动） /// - public string Syst1_PolTmperature { get; set; } - /// - /// ISO温度 - /// - public string Syst1_IsoTmperature { get; set; } - - #endregion - - #region 压力 - /// - /// Pol压力 - /// - public string Syst1_PolPressure { get; set; } - - /// - /// Iso压力 - /// - public string Syst1_IsoPressure { get; set; } - - #endregion + public string Machine_Status_1 { get; set; } - #region 温度 /// - /// Iso温度 + ///POL料位 /// - public string Syst1_PolTemperature { get; set; } - /// - /// Iso温度 - /// - public string Syst1_IsoTemperature { get; set; } - #endregion + public string POL_Level { get; set; } - #region 输出压力 /// - /// POL输出压力 + ///POL温度 /// - public string Syst1_PolOutputPressure { get; set; } - /// - /// ISO输出压力 - /// - public string Syst1_IsoOutputPressure { get; set; } - #endregion + public string POL_Temp { get; set; } - #region 流量 - /// - /// POL流量 - /// - public string Syst1_PolFlow { get; set; } /// - /// ISO流量 + ///POL输入压力 /// - public string Syst1_IsoFlow { get; set; } - #endregion + public string POL_LP { get; set; } - #region 原料用量 - /// - /// POL流量 - /// - public string Syst1_PolMaterialLeve { get; set; } /// - /// ISO流量 + ///POL输出压力 /// - public string Syst1_IsoMaterialLeve { get; set; } - #endregion + public string POL_HP { get; set; } - #region 液压 - /// - /// 液压压力 - /// - public string Syst1_Pressure { get; set; } /// - /// 液压 + ///POL流量 /// - public string Syst1_Temperature { get; set; } - #endregion + public string POL_Vol { get; set; } - #region 结束信号 /// - /// A1结束信号 + ///POL原料用量 /// - public string Syst1_A1_End { get; set; } - /// - /// 结束信号 - /// - public string Syst1_B1_End { get; set; } - #endregion + public string POL_Usage { get; set; } - #region A1-B1 POL注料压力 /// - /// A1 POL注料压力 + ///POL变频器转速 /// - public string Syst1_A1_POLPressure { get; set; } - /// - /// B1 POL注料压力 - /// - public string Syst1_B1_POLPressure { get; set; } - #endregion + public string POL_Freq_Speed { get; set; } - #region A1-B1 POL注料温度 - /// - /// A1 POL注料温度 - /// - public string Syst1_A1_POLTemperature { get; set; } /// - /// B1 POL注料温度 + ///ISO料位 /// - public string Syst1_B1_POLTemperature { get; set; } - #endregion + public string ISO_Level { get; set; } - #region A1-B1 ISO注料压力 - /// - /// A1 ISO注料压力 - /// - public string Syst1_A1_ISOPressure { get; set; } /// - /// B1 ISO注料压力 + ///ISO温度 /// - public string Syst1_B1_ISOPressure { get; set; } - #endregion + public string ISO_Temp { get; set; } - #region A1-B1 ISO注料压力 - /// - /// A1 ISO注料压力 - /// - public string Syst1_A1_ISOTemperature { get; set; } /// - /// B1 ISO注料压力 + ///ISO输入压力 /// - public string Syst1_B1_ISOTemperature { get; set; } - #endregion + public string ISO_LP { get; set; } - - #region 系统2料位 /// - /// POL料位 + ///ISO输出压力 /// - public int Syst2_POLMaterialLevel { get; set; } + public string ISO_HP { get; set; } /// - /// ISO料位 + ///ISO流量 /// - public int Syst2_ISOMaterialLevel { get; set; } - #endregion + public string ISO_Vol { get; set; } - #region 系统2温度 - /// - /// Plo温度 - /// - public string Syst2_PolTmperature { get; set; } /// - /// ISO温度 + ///ISO原料用量 /// - public string Syst2_IsoTmperature { get; set; } + public string ISO_Usage { get; set; } - #endregion - - #region 系统2压力 /// - /// Pol压力 + ///ISO变频器转速 /// - public string Syst2_PolPressure { get; set; } + public string ISO_Freq_Speed { get; set; } /// - /// Iso压力 + ///液压压力 /// - public string Syst2_IsoPressure { get; set; } - - #endregion + public string Hydr_Press { get; set; } - #region 系统2温度 /// - /// Iso温度 + ///液压温度 /// - public string Syst2_PolTemperature { get; set; } - /// - /// Iso温度 - /// - public string Syst2_IsoTemperature { get; set; } - #endregion + public string Hydr_Temp { get; set; } - #region 系统2输出压力 - /// - /// POL输出压力 - /// - public string Syst2_PolOutputPressure { get; set; } - /// - /// ISO输出压力 - /// - public string Syst2_IsoOutputPressure { get; set; } - #endregion - - #region 系统2流量 - /// - /// POL流量 - /// - public string Syst2_PolFlow { get; set; } - /// - /// ISO流量 - /// - public string Syst2_IsoFlow { get; set; } - #endregion - - #region 系统2原料用量 - /// - /// POL流量 - /// - public string Syst2_PolMaterialLeve { get; set; } - /// - /// ISO流量 - /// - public string Syst2_IsoMaterialLeve { get; set; } - #endregion - - #region 系统2液压 - /// - /// 液压压力 - /// - public string Syst2_Pressure { get; set; } - /// - /// 液压 - /// - public string Syst2_Temperature { get; set; } - #endregion - - #region 系统2结束信号 - /// - /// A1结束信号 - /// - public string Syst2_A1_End { get; set; } - /// - /// 结束信号 - /// - public string Syst2_B1_End { get; set; } - #endregion - - #region 系统2 A1-B1 POL注料压力 - /// - /// A1 POL注料压力 - /// - public string Syst2_A1_POLPressure { get; set; } - /// - /// B1 POL注料压力 - /// - public string Syst2_B1_POLPressure { get; set; } - #endregion - - #region 系统2 A1-B1 POL注料温度 - /// - /// A1 POL注料温度 - /// - public string Syst2_A1_POLTemperature { get; set; } - /// - /// B1 POL注料温度 - /// - public string Syst2_B1_POLTemperature { get; set; } - #endregion - - #region 系统2 A1-B1 ISO注料压力 - /// - /// A1 ISO注料压力 - /// - public string Syst2_A1_ISOPressure { get; set; } - /// - /// B1 ISO注料压力 - /// - public string Syst2_B1_ISOPressure { get; set; } - #endregion - - #region 系统2 A1-B1 ISO注料压力 - /// - /// A1 ISO注料压力 - /// - public string Syst2_A1_ISOTemperature { get; set; } /// - /// B1 ISO注料压力 + ///采集时间 /// - public string Syst2_B1_ISOTemperature { get; set; } - #endregion + public DateTime collectTime { get; set; } } } diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs index 919dd492..41618ef3 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMachinesPageViewModel.cs @@ -4,6 +4,7 @@ using Admin.Core.Model; using Admin.Core.Model.ViewModels; using Admin.Core.Service; using Admin.Core.Tasks; +using Aucma.Core.BoxFoam.Business; using Aucma.Core.BoxFoam.Models; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.Extensions.DependencyInjection; @@ -22,48 +23,188 @@ namespace Aucma.Core.BoxFoam.ViewModels public FoamMachinesPageViewModel() { - Job_BoxFoamLastData_Quartz.RefreshLastShotDataDelegateEvent += RefreshData; + CollectionFoamMachine.RefreshLastShotDataDelegateEvent += RefreshData; + CollectionFoamMachine.RefreshGunDataDelegateEvent += RefreshGunData; + CollectionFoamMachine.RefreshSystemDataDelegateEvent += RefreshSystemData; _boxLastShotRecordServices = App.ServiceProvider.GetService(); - // LoadData(); + LoadData(); //Task.WaitAll(LoadData()); } + + #region 刷新系统参数---系统1，系统2 + /// + /// 系统1，系统2数据刷新 + /// + public void RefreshSystemData(Dictionary keys) + { + foreach (KeyValuePair kvp in keys) + { + if (kvp.Key.Equals("1")) + { + RefreshSystem1(kvp.Value); + } + else if (kvp.Key.Equals("2")) + { + RefreshSystem2(kvp.Value); + + } + } + } + /// + /// 刷新系统1 + /// + /// + public void RefreshSystem1(FoamMachinesModel record) + { + PolInputPressure1 = record.POL_LP; + IsoInputPressure1 = record.ISO_LP; + PolOutputPressure1 = record.POL_HP; + IsoOutputPressure1 = record.ISO_HP; + PolFlow1 = record.POL_Vol; + IsoFlow1 = record.ISO_Vol; + PoleTmperature1 = record.POL_Temp; + IsoTemperature1 = record.ISO_Temp; + PolMaterialLevel1 = record.POL_Level; + IsoMaterialLevel1 = record.ISO_Level; + Pressure1 = record.Hydr_Press; + Temperature1 = record.Hydr_Temp; + } + /// + /// 刷新系统2 + /// + /// + public void RefreshSystem2(FoamMachinesModel record) + { + PolInputPressure2 = record.POL_LP; + IsoInputPressure2 = record.ISO_LP; + PolOutputPressure2 = record.POL_HP; + IsoOutputPressure2 = record.ISO_HP; + PolFlow2 = record.POL_Vol; + IsoFlow2 = record.ISO_Vol; + PoleTmperature2 = record.POL_Temp; + IsoTemperature2 = record.ISO_Temp; + PolMaterialLevel2 = record.POL_Level; + IsoMaterialLevel2 = record.ISO_Level; + Pressure2 = record.Hydr_Press; + Temperature2 = record.Hydr_Temp; + } + + #endregion + + + + #region 刷新每一枪数据 + /// + /// A1,B1,A2,B2枪数据刷新 + /// + public void RefreshGunData(Dictionary keys) + { + foreach (KeyValuePair kvp in keys) + { + if (kvp.Key.Equals("A1")) + { + RefreshA1(kvp.Value); + } + else if (kvp.Key.Equals("B1")) + { + RefreshB1(kvp.Value); + } + else if (kvp.Key.Equals("A2")) + { + RefreshA2(kvp.Value); + } + else if (kvp.Key.Equals("B2")) + { + RefreshB2(kvp.Value); + } + } + } + /// + /// 刷新A1数据 + /// + /// + public void RefreshA1(BoxLastShotRecord record) + { + POLPressure1a = record.PolHp; + POLTemperature1a = record.PolTemp; + ISOPressure1a = record.IsoHp; + ISOTemperature1a = record.IsoTemp; + } + /// + /// 刷新B1数据 + /// + /// + public void RefreshB1(BoxLastShotRecord record) + { + POLPressure1b = record.PolHp; + POLTemperature1b = record.PolTemp; + ISOPressure1b = record.IsoHp; + ISOTemperature1b = record.IsoTemp; + + } + /// + /// 刷新A2数据 + /// + /// + public void RefreshA2(BoxLastShotRecord record) + { + POLPressure2a = record.PolHp; + POLTemperature2a = record.PolTemp; + ISOPressure2a = record.IsoHp; + ISOTemperature2a = record.IsoTemp; + } + + /// + /// 刷新B2数据 + /// + /// + public void RefreshB2(BoxLastShotRecord record) + { + POLPressure2b = record.PolHp; + POLTemperature2b = record.PolTemp; + ISOPressure2b = record.IsoHp; + ISOTemperature2b = record.IsoTemp; + } + #endregion + + /// + /// datagrid刷新 + /// + /// public void RefreshData(BoxLastShotRecord record) { System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () => { - string system = string.Empty; - if (record.System == "1") { + string system = string.Empty; + if (record.System == "1") + { system = "1系统"; - - // PolFlow1 = record.POLInjecFlowRate; - // IsoFlow1 = record.ISOInjecFlowRate; - // PoleTmperature1 = record.POLInjecTemperatureOfGunHead; - // IsoTemperature1 = record.ISOInjecTemperatureOfGunHead; + // PolFlow1 = record.POLInjecFlowRate; + // IsoFlow1 = record.ISOInjecFlowRate; + // PoleTmperature1 = record.POLInjecTemperatureOfGunHead; + // IsoTemperature1 = record.ISOInjecTemperatureOfGunHead; } - if (record.System == "2") { system = "2系统"; } - LastShotRecordDataGrid.Add(new LastShotRecordModel() - { - No = LastShotRecordDataGrid.Count+1, - System = system, - GunHead = record.GunCode, - // StationNumber = record.StationNumber, - PolInjectionpressure = record.PolHp, - IsoInjectionpressure = record.IsoHp, - PolInjectiontemperature = record.PolTemp, - IsoInjectiontemperature = record.IsoTemp, - LastTime = record.CreateTime, - Createtime = record.CreateTime - }); - + if (record.System == "2") { system = "2系统"; } + LastShotRecordModel model = new LastShotRecordModel(); + model.No = LastShotRecordDataGrid.Count + 1; + model.System = system; + model.GunHead = record.GunCode; + // StationNumber = record.StationNumber, + model.IsoInjectionpressure = record.PolHp; + model.IsoInjectionpressure = record.IsoHp; + model.PolInjectiontemperature = record.PolTemp; + model.IsoInjectiontemperature = record.IsoTemp; + model.PolInjectionpressure = record.PolHp; + model.StationNumber = record.PourNu; + model.LastTime = record.CreateTime; + model.Createtime = record.CreateTime; + LastShotRecordDataGrid.Insert(0, model); })); - } - - - + #region 加载DataGrid数据 private async Task LoadData() { @@ -74,29 +215,33 @@ namespace Aucma.Core.BoxFoam.ViewModels int i = 1; var list = await _boxLastShotRecordServices.QueryAsync(); if (list == null) return; - list.OrderByDescending(d => d.CreateTime); - foreach (var item in list.Take(50)) + list.OrderByDescending(d => d.CreateTime).Take(30); + foreach (var item in list) { string system = string.Empty; if (item.System == "1") { system = "1系统"; } if (item.System == "2") { system = "2系统"; } - LastShotRecordDataGrid.Add(new LastShotRecordModel() + LastShotRecordModel model = new LastShotRecordModel(); + if (LastShotRecordDataGrid.Count() == 0) + { + model.No = 1; + } + else { - No = i, - System = system, - GunHead=item.GunCode, - // StationNumber=item.StationNumber, - PolInjectionpressure = item.PolHp, - IsoInjectionpressure = item.IsoHp, - PolInjectiontemperature = item.PolTemp, - IsoInjectiontemperature = item.IsoTemp, - LastTime = item.CreateTime, - Createtime = item.CreateTime - }); - i++; - }; - // Datalist.Insert(0, Datalist[Datalist.Count - 1]); - // Datalist.RemoveAt(Datalist.Count - 1); + model.No = LastShotRecordDataGrid.Count() + 1; + } + model.No = i; + model.System = system; + model.GunHead = item.GunCode; + model.PolInjectionpressure = item.PolHp; + model.IsoInjectionpressure = item.IsoHp; + model.PolInjectiontemperature = item.PolTemp; + model.IsoInjectiontemperature = item.IsoTemp; + model.LastTime = item.CreateTime; + model.Createtime = item.CreateTime; + model.StationNumber = item.PourNu; + LastShotRecordDataGrid.Insert(0, model); + } })); } @@ -228,79 +373,103 @@ namespace Aucma.Core.BoxFoam.ViewModels get => _temperature1; set => SetProperty(ref _temperature1, value); } + + /// /// A枪状态 /// - private string _status1; - public string Status1 + //private string _status1a; + //public string Status1a + //{ + // get => _status1a; + // set => SetProperty(ref _status1a, value); + //} + + /// + /// pol压力 + /// + private string _POLPressure1a = "0.00"; + public string POLPressure1a { - get => _status1; - set => SetProperty(ref _status1, value); + get => _POLPressure1a; + set => SetProperty(ref _POLPressure1a, value); } + /// - /// B枪状态 + /// A枪POL温度 /// - private string _status11; - public string Status11 + private string _POLTemperature1a = "0.00"; + public string POLTemperature1a { - get => _status11; - set => SetProperty(ref _status11, value); + get => _POLTemperature1a; + set => SetProperty(ref _POLTemperature1a, value); } /// - /// 压力 + /// iso压力 /// - private string _POLPressure1 = "0.00"; - public string POLPressure1 + private string _ISOPressure1a = "0.00"; + public string ISOPressure1a { - get => _POLPressure1; - set => SetProperty(ref _POLPressure1, value); + get => _ISOPressure1a; + set => SetProperty(ref _ISOPressure1a, value); } /// - /// A枪POL温度 + /// iso温度 /// - private string _POLTemperature1 = "0.00"; - public string POLTemperature1 + private string _ISOTemperature1a = "0.0"; + public string ISOTemperature1a { - get => _POLTemperature1; - set => SetProperty(ref _POLTemperature1, value); + get => _ISOTemperature1a; + set => SetProperty(ref _ISOTemperature1a, value); } + /// - /// B枪POL温度 + /// B枪状态 /// - private string _POLTemperature11 = "0.0"; - public string POLTemperature11 + //private string _status1b; + //public string Status1b + //{ + // get => _status1b; + // set => SetProperty(ref _status1b, value); + //} + + /// + /// B枪pol压力 + /// + private string _POLPressure1b = "0.00"; + public string POLPressure1b { - get => _POLTemperature11; - set => SetProperty(ref _POLTemperature11, value); + get => _POLPressure1b; + set => SetProperty(ref _POLPressure1b, value); } + /// - /// 压力 + /// B枪POL温度 /// - private string _ISOPressure1 = "0.00"; - public string ISOPressure1 + private string _POLTemperature1b = "0.00"; + public string POLTemperature1b { - get => _ISOPressure1; - set => SetProperty(ref _ISOPressure1, value); + get => _POLTemperature1b; + set => SetProperty(ref _POLTemperature1b, value); } /// - /// 压力 + /// B枪iso压力 /// - private string _ISOPressure11 = "0.00"; - public string ISOPressure11 + private string _ISOPressure1b = "0.00"; + public string ISOPressure1b { - get => _ISOPressure11; - set => SetProperty(ref _ISOPressure11, value); + get => _ISOPressure1b; + set => SetProperty(ref _ISOPressure1b, value); } /// - /// 温度 + /// B枪iso温度 /// - private string _ISOTemperature11 = "0.0"; - public string ISOTemperature11 + private string _ISOTemperature1b = "0.0"; + public string ISOTemperature1b { - get => _ISOTemperature11; - set => SetProperty(ref _ISOTemperature11, value); + get => _ISOTemperature1b; + set => SetProperty(ref _ISOTemperature1b, value); } - #endregion #region 2系统属性 @@ -415,100 +584,92 @@ namespace Aucma.Core.BoxFoam.ViewModels get => _temperature2; set => SetProperty(ref _temperature2, value); } + /// - /// A枪状态 - /// - private string _status2 = ""; - public string Status2 - { - get => _status2; - set => SetProperty(ref _status2, value); - } - /// - /// B枪状态 + /// A枪POL压力 /// - private string _status12 = ""; - public string Status12 + private string _POLPressure2a = "0.00"; + public string POLPressure2a { - get => _status12; - set => SetProperty(ref _status12, value); + get => _POLPressure2a; + set => SetProperty(ref _POLPressure2a, value); } /// - /// 压力 + /// A枪POL温度 /// - private string _POLPressure2 = "0.00"; - public string POLPressure2 + private string _POLTemperature2a = "0.00"; + public string POLTemperature2a { - get => _POLPressure2; - set => SetProperty(ref _POLPressure2, value); + get => _POLTemperature2a; + set => SetProperty(ref _POLTemperature2a, value); } /// - /// 温度 + /// iso压力 /// - private string _POLTemperature2 = "0.00"; - public string POLTemperature2 + private string _ISOPressure2a = "0.00"; + public string ISOPressure2a { - get => _POLTemperature2; - set => SetProperty(ref _POLTemperature2, value); + get => _ISOPressure2a; + set => SetProperty(ref _ISOPressure2a, value); } /// - /// A枪压力 + /// iso温度 /// - private string _ISOPressure2 = "0.00"; - public string ISOPressure2 + private string _ISOTemperature2a = "0.0"; + public string ISOTemperature2a { - get => _ISOPressure2; - set => SetProperty(ref _ISOPressure2, value); + get => _ISOTemperature2a; + set => SetProperty(ref _ISOTemperature2a, value); } + /// - ///A枪温度 + /// B枪状态 /// - private string _ISOTemperature22 = "0.0"; - public string ISOTemperature22 - { - get => _ISOTemperature22; - set => SetProperty(ref _ISOTemperature22, value); - } + //private string _status2b; + //public string Status2b + //{ + // get => _status2b; + // set => SetProperty(ref _status2b, value); + //} + /// - /// B枪温度 + /// B枪pol压力 /// - private string _ISOTemperature222 = "0.0"; - public string ISOTemperature222 + private string _POLPressure2b = "0.00"; + public string POLPressure2b { - get => _ISOTemperature222; - set => SetProperty(ref _ISOTemperature222, value); + get => _POLPressure2b; + set => SetProperty(ref _POLPressure2b, value); } + /// - /// B枪温度 + /// B枪POL温度 /// - private string _POLPressure22 = "0.0"; - public string POLPressure22 + private string _POLTemperature2b = "0.00"; + public string POLTemperature2b { - get => _POLPressure22; - set => SetProperty(ref _POLPressure22, value); + get => _POLTemperature2b; + set => SetProperty(ref _POLTemperature2b, value); } - /// - /// B枪ISO温度 + /// B枪iso压力 /// - private string _POLTemperature22 = "0.0"; - public string POLTemperature22 + private string _ISOPressure2b = "0.00"; + public string ISOPressure2b { - get => _POLTemperature22; - set => SetProperty(ref _POLTemperature22, value); + get => _ISOPressure2b; + set => SetProperty(ref _ISOPressure2b, value); } - /// - /// B枪ISO压力 + /// B枪iso温度 /// - private string _ISOPressure22 = "0.0"; - public string ISOPressure22 + private string _ISOTemperature2b = "0.0"; + public string ISOTemperature2b { - get => _ISOPressure22; - set => SetProperty(ref _ISOPressure22, value); + get => _ISOTemperature2b; + set => SetProperty(ref _ISOTemperature2b, value); } - #endregion } } diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index 23848209..f6bcb366 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -342,7 +342,7 @@ namespace Aucma.Core.BoxFoam.ViewModels else { // 白夜班切换 - ShiftChangeAsync(productLineCode, currentTeamTime); + ShiftChangeAsync(productLineCode); } } @@ -422,7 +422,7 @@ namespace Aucma.Core.BoxFoam.ViewModels } } - private async void ShiftChangeAsync(string productLineCode, CurrentTeamTime currentTeamTime) + private async void ShiftChangeAsync(string productLineCode) { try { @@ -434,9 +434,11 @@ namespace Aucma.Core.BoxFoam.ViewModels //更新计划表操作 - //CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync(); + CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync(); + + // 更新当班时间 - currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName; + currentTeamTime.TeamName = currentTeamTimeList.First().TeamName; currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime); currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime); bool result = await _currentTeamTimeServices.UpdateAsync(currentTeamTime); diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index b0c244d5..5e0df1b6 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/Aucma.Core.BoxFoam/appsettings.json @@ -212,6 +212,14 @@ "Enabled": true, "IP": "10.10.93.1", "Port": 102 + }, + { + "Id": 3, + "EquipName": "foamMachinePlc", + "PlcType": "Siemens", + "Enabled": true, + "IP": "127.0.0.1", + "Port": 102 } ], "StoreInfo": { diff --git a/Aucma.Core.DoorFoam/Business/DoorCollection.cs b/Aucma.Core.DoorFoam/Business/DoorCollection.cs index 5504026e..a5d4ccdb 100644 --- a/Aucma.Core.DoorFoam/Business/DoorCollection.cs +++ b/Aucma.Core.DoorFoam/Business/DoorCollection.cs @@ -1,7 +1,13 @@ -using Admin.Core.Common.Helper; +using Admin.Core.Common; +using Admin.Core.Common.Helper; +using Admin.Core.IService; +using Admin.Core.Model; using Aucma.Core.HwPLc; +using Microsoft.Extensions.DependencyInjection; using NetTaste; +using NPOI.SS.Formula.Functions; using NPOI.Util; +using SqlSugar; using System; using System.Collections.Generic; using System.DirectoryServices.Protocols; @@ -19,163 +25,607 @@ namespace Aucma.Core.DoorFoam.Business /// public class DoorCollection { - // public delegate Task RefreshBoxFoamDataDelegate(List list); - - private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding(); - // public static List listFixtureStatus = new List(); + private IDoorFoamMachineServices _doorFoamMachineServices; + + /// + /// 刷新门体发泡数据 + /// + /// + public delegate void RefreshDoorFoamMachine(List doorFoams); + public event RefreshDoorFoamMachine RefreshDoorFoamMachineEvent; - public static List BoxTypeList = new List(); - public static List HolderStatusList = new List(); - public static List HolderOutPutList = new List(); - public static List SolidifyTimeList = new List(); - public static List ActualTimeList = new List(); - public static List MoldTemperatureList = new List(); - public static List ProductionCycleList = new List(); - Semaphore semaphore = new Semaphore(1, 1); public DoorCollection() { - startCollect(); + + _doorFoamMachineServices = App.ServiceProvider.GetService(); } public void startCollect() { - Task.Run(() => + while (true) { - while (true) + //semaphore.WaitOne(); + try { - semaphore.WaitOne(); - try + Thread.Sleep(5000); + + var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("DoorPlc")); + + if (obj != null) { - Thread.Sleep(3000); - - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("门体发泡Plc")); - - if (obj != null) - { - //BoxTypeList.Clear(); - ReadModeStatus(obj, BoxTypeList); - // 1-5 6-10 11-15 16-20 21-25 25-30 - ReadModeType(obj, "DB4.142", BoxTypeList); - ReadModeType(obj, "DB4.342", BoxTypeList); - ReadModeType(obj, "DB4.542", BoxTypeList); - ReadModeType(obj, "DB4.742", BoxTypeList); - ReadModeType(obj, "DB4.942", BoxTypeList); - ReadModeType(obj, "DB4.1142", BoxTypeList); - // 31-34 - ReadModeTypeLast(obj, "DB4.1342", BoxTypeList); - - ReadModeProduct(obj, "DB4.1542", BoxTypeList); - ReadModeProduct(obj, "DB4.1702", BoxTypeList); - ReadModeProduct(obj, "DB4.1862", BoxTypeList); - // 31-34 - ReadModeProductLast(obj, "DB4.2022", BoxTypeList); - - ReadEquipStatusAndCycle(obj,BoxTypeList); - ReadWarnInfo(obj, BoxTypeList); + //读取所有模具状态 + List moldStatusList = ReadModeStatus(obj); + //读取所有模具型号 + List moldTypeList = ReadModeType(obj); + //读取所有模具产量 + List moldOutPutList = ReadModeProduct(obj); + + + #region 读取设备状态（1运行 2停机 3故障）、生产节拍、节拍、设备报警 + byte[] info = obj.plc.Read("DB4.2086", 10); + int deviceStatus = 0; + float productTakt = 0; + float taktNum = 0; + if (info != null) + { + //设备状态1运行 2停机 3故障 + deviceStatus = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray())); + // 生产节拍 + productTakt = byteToFloat(info.Skip(2).Take(4).ToArray()); + //节拍 + taktNum = byteToFloat(info.Skip(6).Take(4).ToArray()); } - } - catch (Exception) - { - throw; - } - finally - { - semaphore.Release(); + int deviceAlarm = obj.plc.ReadInt32("DB4.2136"); + #endregion + + List result = new List(); + + var mergedCollection = from moldStatus in moldStatusList + join moldType in moldTypeList on new { moldStatus.StationTrolleyNumber, moldStatus.GunNumber } equals new { moldType.StationTrolleyNumber, moldType.GunNumber } + join moldOutPut in moldOutPutList on new { moldStatus.StationTrolleyNumber, moldStatus.GunNumber } equals new { moldOutPut.StationTrolleyNumber, moldOutPut.GunNumber } + select new DoorFoamMachine + { + StationTrolleyNumber = moldStatus.StationTrolleyNumber, + GunNumber = moldStatus.GunNumber, + MoldType_A = moldType.MoldType_A, + MoldType_B = moldType.MoldType_B, + MoldProdutionA = moldOutPut.MoldProdutionA, + MoldProdutionB = moldOutPut.MoldProdutionB, + DeviceStatus = deviceStatus, + DeviceAlarm = deviceAlarm, + ProductTakt = productTakt, + Takt = taktNum, + CreateTime = DateTime.Now + }; + result = mergedCollection.ToList(); + if(result != null) + { + RefreshDoorFoamMachineEvent?.Invoke(result); + + var addFlag = _doorFoamMachineServices.AddAsync(result).Result; + } + } } - }); + catch (Exception ex) + { + + Console.WriteLine($"门体发泡数据采集异常：{ex.Message}"); + } + } } /// /// 读取模位状态 /// - static void ReadModeStatus(HwPLc.PlcModel obj, List boxTypeList) + static List ReadModeStatus(HwPLc.PlcModel obj) { - if (obj == null) return; + if (obj == null) return null; else { + List doorFoams = new List(); if (obj.plc.IsConnected) { + byte[] info = obj.plc.Read("DB4.0", 142); - if (info == null) return; - ///出模工位台车号,上料工位台车号,注料工位台车号 - short tempNo1 = short.Parse(StringChange.bytesToHexStr(info.Skip(0).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short tempNo2 = short.Parse(StringChange.bytesToHexStr(info.Skip(2).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short tempNo3 = short.Parse(StringChange.bytesToHexStr(info.Skip(4).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - //模位状态,台车1#枪模式：0，不工作；1，A门工作；2，B门工作；3,AB门工作 - short temp1 = short.Parse(StringChange.bytesToHexStr(info.Skip(6).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp2 = short.Parse(StringChange.bytesToHexStr(info.Skip(8).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp3 = short.Parse(StringChange.bytesToHexStr(info.Skip(10).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp4 = short.Parse(StringChange.bytesToHexStr(info.Skip(12).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp5 = short.Parse(StringChange.bytesToHexStr(info.Skip(14).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp6 = short.Parse(StringChange.bytesToHexStr(info.Skip(16).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp7 = short.Parse(StringChange.bytesToHexStr(info.Skip(18).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp8 = short.Parse(StringChange.bytesToHexStr(info.Skip(20).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp9 = short.Parse(StringChange.bytesToHexStr(info.Skip(22).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp10 = short.Parse(StringChange.bytesToHexStr(info.Skip(24).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp11 = short.Parse(StringChange.bytesToHexStr(info.Skip(26).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp12 = short.Parse(StringChange.bytesToHexStr(info.Skip(28).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp13 = short.Parse(StringChange.bytesToHexStr(info.Skip(30).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp14 = short.Parse(StringChange.bytesToHexStr(info.Skip(32).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp15 = short.Parse(StringChange.bytesToHexStr(info.Skip(34).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp16 = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp17 = short.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp18 = short.Parse(StringChange.bytesToHexStr(info.Skip(40).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp19 = short.Parse(StringChange.bytesToHexStr(info.Skip(42).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp20 = short.Parse(StringChange.bytesToHexStr(info.Skip(44).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp21 = short.Parse(StringChange.bytesToHexStr(info.Skip(46).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp22 = short.Parse(StringChange.bytesToHexStr(info.Skip(48).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp23 = short.Parse(StringChange.bytesToHexStr(info.Skip(50).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp24 = short.Parse(StringChange.bytesToHexStr(info.Skip(52).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp25 = short.Parse(StringChange.bytesToHexStr(info.Skip(54).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp26 = short.Parse(StringChange.bytesToHexStr(info.Skip(56).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp27 = short.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp28 = short.Parse(StringChange.bytesToHexStr(info.Skip(60).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp29 = short.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp30 = short.Parse(StringChange.bytesToHexStr(info.Skip(64).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp31 = short.Parse(StringChange.bytesToHexStr(info.Skip(66).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp32 = short.Parse(StringChange.bytesToHexStr(info.Skip(68).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp33 = short.Parse(StringChange.bytesToHexStr(info.Skip(70).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp34 = short.Parse(StringChange.bytesToHexStr(info.Skip(72).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp35 = short.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp36 = short.Parse(StringChange.bytesToHexStr(info.Skip(76).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp37 = short.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp38 = short.Parse(StringChange.bytesToHexStr(info.Skip(80).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp39 = short.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp40 = short.Parse(StringChange.bytesToHexStr(info.Skip(84).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp41 = short.Parse(StringChange.bytesToHexStr(info.Skip(86).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp42 = short.Parse(StringChange.bytesToHexStr(info.Skip(88).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp43 = short.Parse(StringChange.bytesToHexStr(info.Skip(90).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp44 = short.Parse(StringChange.bytesToHexStr(info.Skip(92).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp45 = short.Parse(StringChange.bytesToHexStr(info.Skip(94).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp46 = short.Parse(StringChange.bytesToHexStr(info.Skip(96).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp47 = short.Parse(StringChange.bytesToHexStr(info.Skip(98).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp48 = short.Parse(StringChange.bytesToHexStr(info.Skip(100).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp49 = short.Parse(StringChange.bytesToHexStr(info.Skip(102).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp50 = short.Parse(StringChange.bytesToHexStr(info.Skip(104).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp51 = short.Parse(StringChange.bytesToHexStr(info.Skip(106).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp52 = short.Parse(StringChange.bytesToHexStr(info.Skip(108).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp53 = short.Parse(StringChange.bytesToHexStr(info.Skip(110).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp54 = short.Parse(StringChange.bytesToHexStr(info.Skip(112).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp55 = short.Parse(StringChange.bytesToHexStr(info.Skip(114).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp56 = short.Parse(StringChange.bytesToHexStr(info.Skip(116).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp57 = short.Parse(StringChange.bytesToHexStr(info.Skip(118).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp58 = short.Parse(StringChange.bytesToHexStr(info.Skip(120).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp59 = short.Parse(StringChange.bytesToHexStr(info.Skip(122).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp60 = short.Parse(StringChange.bytesToHexStr(info.Skip(124).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp61 = short.Parse(StringChange.bytesToHexStr(info.Skip(126).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp62 = short.Parse(StringChange.bytesToHexStr(info.Skip(128).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp63 = short.Parse(StringChange.bytesToHexStr(info.Skip(130).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp64 = short.Parse(StringChange.bytesToHexStr(info.Skip(132).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp65 = short.Parse(StringChange.bytesToHexStr(info.Skip(134).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp66 = short.Parse(StringChange.bytesToHexStr(info.Skip(136).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp67 = short.Parse(StringChange.bytesToHexStr(info.Skip(138).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - short temp68 = short.Parse(StringChange.bytesToHexStr(info.Skip(140).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - Console.WriteLine(temp68); + if(info != null) + { + ///出模工位台车号,上料工位台车号,注料工位台车号 + short tempNo1 = short.Parse(StringChange.bytesToHexStr(info.Skip(0).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + + short tempNo2 = short.Parse(StringChange.bytesToHexStr(info.Skip(2).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + + short tempNo3 = short.Parse(StringChange.bytesToHexStr(info.Skip(4).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + + //模位状态,台车1#枪模式：0，不工作；1，A门工作；2，B门工作；3,AB门工作 + #region 读取模具状态 + short temp1 = short.Parse(StringChange.bytesToHexStr(info.Skip(6).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =1, + GunNumber =1, + MoldStatus = temp1.ToString(), + }); + + short temp2 = short.Parse(StringChange.bytesToHexStr(info.Skip(8).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =1, + GunNumber =2, + MoldStatus = temp2.ToString(), + }); + short temp3 = short.Parse(StringChange.bytesToHexStr(info.Skip(10).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =2, + GunNumber =1, + MoldStatus = temp3.ToString(), + }); + short temp4 = short.Parse(StringChange.bytesToHexStr(info.Skip(12).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =2, + GunNumber =2, + MoldStatus = temp4.ToString(), + }); + short temp5 = short.Parse(StringChange.bytesToHexStr(info.Skip(14).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =3, + GunNumber =1, + MoldStatus = temp5.ToString(), + }); + short temp6 = short.Parse(StringChange.bytesToHexStr(info.Skip(16).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =3, + GunNumber =2, + MoldStatus = temp6.ToString(), + }); + short temp7 = short.Parse(StringChange.bytesToHexStr(info.Skip(18).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =4, + GunNumber =1, + MoldStatus = temp7.ToString(), + }); + short temp8 = short.Parse(StringChange.bytesToHexStr(info.Skip(20).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =4, + GunNumber =2, + MoldStatus = temp8.ToString(), + }); + short temp9 = short.Parse(StringChange.bytesToHexStr(info.Skip(22).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =5, + GunNumber =1, + MoldStatus = temp9.ToString(), + }); + short temp10 = short.Parse(StringChange.bytesToHexStr(info.Skip(24).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =5, + GunNumber =2, + MoldStatus = temp10.ToString(), + }); + short temp11 = short.Parse(StringChange.bytesToHexStr(info.Skip(26).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =6, + GunNumber =1, + MoldStatus = temp11.ToString(), + }); + short temp12 = short.Parse(StringChange.bytesToHexStr(info.Skip(28).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =6, + GunNumber =2, + MoldStatus = temp12.ToString(), + }); + short temp13 = short.Parse(StringChange.bytesToHexStr(info.Skip(30).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =7, + GunNumber =1, + MoldStatus = temp13.ToString(), + }); + short temp14 = short.Parse(StringChange.bytesToHexStr(info.Skip(32).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =7, + GunNumber =2, + MoldStatus = temp14.ToString(), + }); + short temp15 = short.Parse(StringChange.bytesToHexStr(info.Skip(34).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =8, + GunNumber =1, + MoldStatus = temp15.ToString(), + }); + short temp16 = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =8, + GunNumber =2, + MoldStatus = temp16.ToString(), + }); + short temp17 = short.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =9, + GunNumber =1, + MoldStatus = temp17.ToString(), + }); + short temp18 = short.Parse(StringChange.bytesToHexStr(info.Skip(40).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =9, + GunNumber =2, + MoldStatus = temp18.ToString(), + }); + short temp19 = short.Parse(StringChange.bytesToHexStr(info.Skip(42).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =10, + GunNumber =1, + MoldStatus = temp19.ToString(), + }); + short temp20 = short.Parse(StringChange.bytesToHexStr(info.Skip(44).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =10, + GunNumber =2, + MoldStatus = temp20.ToString(), + }); + short temp21 = short.Parse(StringChange.bytesToHexStr(info.Skip(46).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =11, + GunNumber =1, + MoldStatus = temp21.ToString(), + }); + short temp22 = short.Parse(StringChange.bytesToHexStr(info.Skip(48).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =11, + GunNumber =2, + MoldStatus = temp22.ToString(), + }); + short temp23 = short.Parse(StringChange.bytesToHexStr(info.Skip(50).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =12, + GunNumber =1, + MoldStatus = temp23.ToString(), + }); + short temp24 = short.Parse(StringChange.bytesToHexStr(info.Skip(52).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =12, + GunNumber =2, + MoldStatus = temp24.ToString(), + }); + short temp25 = short.Parse(StringChange.bytesToHexStr(info.Skip(54).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =13, + GunNumber =1, + MoldStatus = temp25.ToString(), + }); + short temp26 = short.Parse(StringChange.bytesToHexStr(info.Skip(56).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =13, + GunNumber =2, + MoldStatus = temp26.ToString(), + }); + short temp27 = short.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =14, + GunNumber =1, + MoldStatus = temp27.ToString(), + }); + short temp28 = short.Parse(StringChange.bytesToHexStr(info.Skip(60).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =14, + GunNumber =2, + MoldStatus = temp28.ToString(), + }); + short temp29 = short.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =15, + GunNumber =1, + MoldStatus = temp29.ToString(), + }); + short temp30 = short.Parse(StringChange.bytesToHexStr(info.Skip(64).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =15, + GunNumber =2, + MoldStatus = temp30.ToString(), + }); + short temp31 = short.Parse(StringChange.bytesToHexStr(info.Skip(66).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =16, + GunNumber =1, + MoldStatus = temp31.ToString(), + }); + short temp32 = short.Parse(StringChange.bytesToHexStr(info.Skip(68).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =16, + GunNumber =2, + MoldStatus = temp32.ToString(), + }); + short temp33 = short.Parse(StringChange.bytesToHexStr(info.Skip(70).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =17, + GunNumber =1, + MoldStatus = temp33.ToString(), + }); + short temp34 = short.Parse(StringChange.bytesToHexStr(info.Skip(72).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =17, + GunNumber =2, + MoldStatus = temp34.ToString(), + }); + short temp35 = short.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =18, + GunNumber =1, + MoldStatus = temp35.ToString(), + }); + short temp36 = short.Parse(StringChange.bytesToHexStr(info.Skip(76).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =18, + GunNumber =2, + MoldStatus = temp36.ToString(), + }); + short temp37 = short.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =19, + GunNumber =1, + MoldStatus = temp37.ToString(), + }); + short temp38 = short.Parse(StringChange.bytesToHexStr(info.Skip(80).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =19, + GunNumber =2, + MoldStatus = temp38.ToString(), + }); + short temp39 = short.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =20, + GunNumber =1, + MoldStatus = temp39.ToString(), + }); + short temp40 = short.Parse(StringChange.bytesToHexStr(info.Skip(84).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =20, + GunNumber =2, + MoldStatus = temp40.ToString(), + }); + short temp41 = short.Parse(StringChange.bytesToHexStr(info.Skip(86).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =21, + GunNumber =1, + MoldStatus = temp41.ToString(), + }); + short temp42 = short.Parse(StringChange.bytesToHexStr(info.Skip(88).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =21, + GunNumber =2, + MoldStatus = temp42.ToString(), + }); + short temp43 = short.Parse(StringChange.bytesToHexStr(info.Skip(90).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =22, + GunNumber =1, + MoldStatus = temp43.ToString(), + }); + short temp44 = short.Parse(StringChange.bytesToHexStr(info.Skip(92).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =22, + GunNumber =2, + MoldStatus = temp44.ToString(), + }); + short temp45 = short.Parse(StringChange.bytesToHexStr(info.Skip(94).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =23, + GunNumber =1, + MoldStatus = temp45.ToString(), + }); + short temp46 = short.Parse(StringChange.bytesToHexStr(info.Skip(96).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =23, + GunNumber =2, + MoldStatus = temp46.ToString(), + }); + short temp47 = short.Parse(StringChange.bytesToHexStr(info.Skip(98).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =24, + GunNumber =1, + MoldStatus = temp47.ToString(), + }); + short temp48 = short.Parse(StringChange.bytesToHexStr(info.Skip(100).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =24, + GunNumber =2, + MoldStatus = temp48.ToString(), + }); + short temp49 = short.Parse(StringChange.bytesToHexStr(info.Skip(102).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =25, + GunNumber =1, + MoldStatus = temp49.ToString(), + }); + short temp50 = short.Parse(StringChange.bytesToHexStr(info.Skip(104).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =25, + GunNumber =2, + MoldStatus = temp50.ToString(), + }); + short temp51 = short.Parse(StringChange.bytesToHexStr(info.Skip(106).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =26, + GunNumber =1, + MoldStatus = temp51.ToString(), + }); + short temp52 = short.Parse(StringChange.bytesToHexStr(info.Skip(108).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =26, + GunNumber =2, + MoldStatus = temp52.ToString(), + }); + short temp53 = short.Parse(StringChange.bytesToHexStr(info.Skip(110).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =27, + GunNumber =1, + MoldStatus = temp53.ToString(), + }); + short temp54 = short.Parse(StringChange.bytesToHexStr(info.Skip(112).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =27, + GunNumber =2, + MoldStatus = temp54.ToString(), + }); + short temp55 = short.Parse(StringChange.bytesToHexStr(info.Skip(114).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =28, + GunNumber =1, + MoldStatus = temp55.ToString(), + }); + short temp56 = short.Parse(StringChange.bytesToHexStr(info.Skip(116).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =28, + GunNumber =2, + MoldStatus = temp56.ToString(), + }); + short temp57 = short.Parse(StringChange.bytesToHexStr(info.Skip(118).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =29, + GunNumber =1, + MoldStatus = temp57.ToString(), + }); + short temp58 = short.Parse(StringChange.bytesToHexStr(info.Skip(120).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =29, + GunNumber =2, + MoldStatus = temp58.ToString(), + }); + short temp59 = short.Parse(StringChange.bytesToHexStr(info.Skip(122).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =30, + GunNumber =1, + MoldStatus = temp59.ToString(), + }); + short temp60 = short.Parse(StringChange.bytesToHexStr(info.Skip(124).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =30, + GunNumber =2, + MoldStatus = temp60.ToString(), + }); + short temp61 = short.Parse(StringChange.bytesToHexStr(info.Skip(126).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =31, + GunNumber =1, + MoldStatus = temp61.ToString(), + }); + short temp62 = short.Parse(StringChange.bytesToHexStr(info.Skip(128).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =31, + GunNumber =2, + MoldStatus = temp62.ToString(), + }); + short temp63 = short.Parse(StringChange.bytesToHexStr(info.Skip(130).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =32, + GunNumber =1, + MoldStatus = temp63.ToString(), + }); + short temp64 = short.Parse(StringChange.bytesToHexStr(info.Skip(132).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =32, + GunNumber =2, + MoldStatus = temp64.ToString(), + }); + short temp65 = short.Parse(StringChange.bytesToHexStr(info.Skip(134).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =33, + GunNumber =1, + MoldStatus = temp65.ToString(), + }); + short temp66 = short.Parse(StringChange.bytesToHexStr(info.Skip(136).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =33, + GunNumber =2, + MoldStatus = temp66.ToString(), + }); + short temp67 = short.Parse(StringChange.bytesToHexStr(info.Skip(138).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =34, + GunNumber =1, + MoldStatus = temp67.ToString(), + }); + short temp68 = short.Parse(StringChange.bytesToHexStr(info.Skip(140).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =34, + GunNumber =2, + MoldStatus = temp68.ToString(), + }); + #endregion + + + } } + + return doorFoams; } } @@ -184,40 +634,699 @@ namespace Aucma.Core.DoorFoam.Business /// /// 读取模位型号，读5台，1-5,6-10... /// - static void ReadModeType(HwPLc.PlcModel obj, string startStr, List boxTypeList) + static List ReadModeType(HwPLc.PlcModel obj) { - if (obj == null) return; + if (obj == null) return null; else { + List doorFoams = new List(); if (obj.plc.IsConnected) { - byte[] info = obj.plc.Read(startStr, 200); - if (info == null) return; + byte[] info1 = obj.plc.Read("DB4.142", 200); //1#台车1#枪A门,1#台车1#枪B门,1#台车2#枪A门,1#台车2#枪B门 - string temp1 = asciiEncoding.GetString(info.Skip(0).Take(10).ToArray()).Trim('\n'); - string temp2 = asciiEncoding.GetString(info.Skip(10).Take(10).ToArray()).Trim('\n'); - string temp3 = asciiEncoding.GetString(info.Skip(20).Take(10).ToArray()).Trim('\n'); - string temp4 = asciiEncoding.GetString(info.Skip(30).Take(10).ToArray()).Trim('\n'); - string temp5 = asciiEncoding.GetString(info.Skip(40).Take(10).ToArray()).Trim('\n'); - string temp6 = asciiEncoding.GetString(info.Skip(50).Take(10).ToArray()).Trim('\n'); - string temp7 = asciiEncoding.GetString(info.Skip(60).Take(10).ToArray()).Trim('\n'); - string temp8 = asciiEncoding.GetString(info.Skip(70).Take(10).ToArray()).Trim('\n'); - string temp9 = asciiEncoding.GetString(info.Skip(80).Take(10).ToArray()).Trim('\n'); - string temp10 = asciiEncoding.GetString(info.Skip(90).Take(10).ToArray()).Trim('\n'); - string temp11 = asciiEncoding.GetString(info.Skip(100).Take(10).ToArray()).Trim('\n'); - string temp12 = asciiEncoding.GetString(info.Skip(110).Take(10).ToArray()).Trim('\n'); - string temp13 = asciiEncoding.GetString(info.Skip(120).Take(10).ToArray()).Trim('\n'); - string temp14 = asciiEncoding.GetString(info.Skip(130).Take(10).ToArray()).Trim('\n'); - string temp15 = asciiEncoding.GetString(info.Skip(140).Take(10).ToArray()).Trim('\n'); - string temp16 = asciiEncoding.GetString(info.Skip(150).Take(10).ToArray()).Trim('\n'); - string temp17 = asciiEncoding.GetString(info.Skip(160).Take(10).ToArray()).Trim('\n'); - string temp18 = asciiEncoding.GetString(info.Skip(170).Take(10).ToArray()).Trim('\n'); - string temp19 = asciiEncoding.GetString(info.Skip(180).Take(10).ToArray()).Trim('\n'); - string temp20 = asciiEncoding.GetString(info.Skip(190).Take(10).ToArray()).Trim('\n'); - Console.WriteLine(temp20); + #region 1-5台车 + if (info1 != null) + { + string trolley_1_1_A = asciiEncoding.GetString(info1.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_1_1_B = asciiEncoding.GetString(info1.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =1, + GunNumber =1, + MoldType_A = trolley_1_1_A, + MoldType_B = trolley_1_1_B + }); + + string trolley_1_2_A = asciiEncoding.GetString(info1.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_1_2_B = asciiEncoding.GetString(info1.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =1, + GunNumber =2, + MoldType_A = trolley_1_2_A, + MoldType_B = trolley_1_2_B + }); + string trolley_2_1_A = asciiEncoding.GetString(info1.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_2_1_B = asciiEncoding.GetString(info1.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =2, + GunNumber =1, + MoldType_A = trolley_2_1_A, + MoldType_B = trolley_2_1_B + }); + string trolley_2_2_A = asciiEncoding.GetString(info1.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_2_2_B = asciiEncoding.GetString(info1.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =2, + GunNumber =2, + MoldType_A = trolley_2_2_A, + MoldType_B = trolley_2_2_B + }); + + string trolley_3_1_A = asciiEncoding.GetString(info1.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_3_1_B = asciiEncoding.GetString(info1.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =3, + GunNumber =1, + MoldType_A = trolley_3_1_A, + MoldType_B = trolley_3_1_B + }); + string trolley_3_2_A = asciiEncoding.GetString(info1.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_3_2_B = asciiEncoding.GetString(info1.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =3, + GunNumber =2, + MoldType_A = trolley_3_2_A, + MoldType_B = trolley_3_2_B + }); + string trolley_4_1_A = asciiEncoding.GetString(info1.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_4_1_B = asciiEncoding.GetString(info1.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =4, + GunNumber =1, + MoldType_A = trolley_4_1_A, + MoldType_B = trolley_4_1_B + }); + string trolley_4_2_A = asciiEncoding.GetString(info1.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_4_2_B = asciiEncoding.GetString(info1.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =4, + GunNumber =2, + MoldType_A = trolley_4_2_A, + MoldType_B = trolley_4_2_B + }); + string trolley_5_1_A = asciiEncoding.GetString(info1.Skip(160).Take(10).ToArray()).Trim('\n'); + string trolley_5_1_B = asciiEncoding.GetString(info1.Skip(170).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =5, + GunNumber =1, + MoldType_A = trolley_5_1_A, + MoldType_B = trolley_5_1_B + }); + string trolley_5_2_A = asciiEncoding.GetString(info1.Skip(180).Take(10).ToArray()).Trim('\n'); + string trolley_5_2_B = asciiEncoding.GetString(info1.Skip(190).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =5, + GunNumber =2, + MoldType_A = trolley_5_2_A, + MoldType_B = trolley_5_2_B + }); + } + #endregion + + byte[] info2 = obj.plc.Read("DB4.342", 200); + + #region 6-10台车 + if(info2 != null) + { + string trolley_6_1_A = asciiEncoding.GetString(info2.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_6_1_B = asciiEncoding.GetString(info2.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =6, + GunNumber =1, + MoldType_A = trolley_6_1_A, + MoldType_B = trolley_6_1_B + }); + + string trolley_6_2_A = asciiEncoding.GetString(info2.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_6_2_B = asciiEncoding.GetString(info2.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =6, + GunNumber =2, + MoldType_A = trolley_6_2_A, + MoldType_B = trolley_6_2_B + }); + string trolley_7_1_A = asciiEncoding.GetString(info2.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_7_1_B = asciiEncoding.GetString(info2.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =7, + GunNumber =1, + MoldType_A = trolley_7_1_A, + MoldType_B = trolley_7_1_B + }); + string trolley_7_2_A = asciiEncoding.GetString(info2.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_7_2_B = asciiEncoding.GetString(info2.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =7, + GunNumber =2, + MoldType_A = trolley_7_2_A, + MoldType_B = trolley_7_2_B + }); + + string trolley_8_1_A = asciiEncoding.GetString(info2.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_8_1_B = asciiEncoding.GetString(info2.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =8, + GunNumber =1, + MoldType_A = trolley_8_1_A, + MoldType_B = trolley_8_1_B + }); + string trolley_8_2_A = asciiEncoding.GetString(info2.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_8_2_B = asciiEncoding.GetString(info2.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =8, + GunNumber =2, + MoldType_A = trolley_8_2_A, + MoldType_B = trolley_8_2_B + }); + string trolley_9_1_A = asciiEncoding.GetString(info2.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_9_1_B = asciiEncoding.GetString(info2.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =9, + GunNumber =1, + MoldType_A = trolley_9_1_A, + MoldType_B = trolley_9_1_B + }); + string trolley_9_2_A = asciiEncoding.GetString(info2.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_9_2_B = asciiEncoding.GetString(info2.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =9, + GunNumber =2, + MoldType_A = trolley_9_2_A, + MoldType_B = trolley_9_2_B + }); + string trolley_10_1_A = asciiEncoding.GetString(info2.Skip(160).Take(10).ToArray()).Trim('\n'); + string trolley_10_1_B = asciiEncoding.GetString(info2.Skip(170).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =10, + GunNumber =1, + MoldType_A = trolley_10_1_A, + MoldType_B = trolley_10_1_B + }); + string trolley_10_2_A = asciiEncoding.GetString(info2.Skip(180).Take(10).ToArray()).Trim('\n'); + string trolley_10_2_B = asciiEncoding.GetString(info2.Skip(190).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =10, + GunNumber =2, + MoldType_A = trolley_10_2_A, + MoldType_B = trolley_10_2_B + }); + } + #endregion + + byte[] info3 = obj.plc.Read("DB4.542", 200); + + #region 11-15台车 + if(info3 != null) + { + string trolley_11_1_A = asciiEncoding.GetString(info3.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_11_1_B = asciiEncoding.GetString(info3.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =11, + GunNumber =1, + MoldType_A = trolley_11_1_A, + MoldType_B = trolley_11_1_B + }); + + string trolley_11_2_A = asciiEncoding.GetString(info3.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_11_2_B = asciiEncoding.GetString(info3.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =11, + GunNumber =2, + MoldType_A = trolley_11_2_A, + MoldType_B = trolley_11_2_B + }); + string trolley_12_1_A = asciiEncoding.GetString(info3.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_12_1_B = asciiEncoding.GetString(info3.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =12, + GunNumber =1, + MoldType_A = trolley_12_1_A, + MoldType_B = trolley_12_1_B + }); + string trolley_12_2_A = asciiEncoding.GetString(info3.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_12_2_B = asciiEncoding.GetString(info3.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =12, + GunNumber =2, + MoldType_A = trolley_12_2_A, + MoldType_B = trolley_12_2_B + }); + + string trolley_13_1_A = asciiEncoding.GetString(info3.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_13_1_B = asciiEncoding.GetString(info3.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =13, + GunNumber =1, + MoldType_A = trolley_13_1_A, + MoldType_B = trolley_13_1_B + }); + string trolley_13_2_A = asciiEncoding.GetString(info3.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_13_2_B = asciiEncoding.GetString(info3.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =13, + GunNumber =2, + MoldType_A = trolley_13_2_A, + MoldType_B = trolley_13_2_B + }); + string trolley_14_1_A = asciiEncoding.GetString(info3.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_14_1_B = asciiEncoding.GetString(info3.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =14, + GunNumber =1, + MoldType_A = trolley_14_1_A, + MoldType_B = trolley_14_1_B + }); + string trolley_14_2_A = asciiEncoding.GetString(info3.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_14_2_B = asciiEncoding.GetString(info3.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =14, + GunNumber =2, + MoldType_A = trolley_14_2_A, + MoldType_B = trolley_14_2_B + }); + string trolley_15_1_A = asciiEncoding.GetString(info3.Skip(160).Take(10).ToArray()).Trim('\n'); + string trolley_15_1_B = asciiEncoding.GetString(info3.Skip(170).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =15, + GunNumber =1, + MoldType_A = trolley_15_1_A, + MoldType_B = trolley_15_1_B + }); + string trolley_15_2_A = asciiEncoding.GetString(info3.Skip(180).Take(10).ToArray()).Trim('\n'); + string trolley_15_2_B = asciiEncoding.GetString(info3.Skip(190).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =15, + GunNumber =2, + MoldType_A = trolley_15_2_A, + MoldType_B = trolley_15_2_B + }); + } + #endregion + + byte[] info4 = obj.plc.Read("DB4.742", 200); + #region 16-20台车 + if(info4 != null) + { + string trolley_16_1_A = asciiEncoding.GetString(info4.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_16_1_B = asciiEncoding.GetString(info4.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =16, + GunNumber =1, + MoldType_A = trolley_16_1_A, + MoldType_B = trolley_16_1_B + }); + + string trolley_16_2_A = asciiEncoding.GetString(info4.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_16_2_B = asciiEncoding.GetString(info4.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =16, + GunNumber =2, + MoldType_A = trolley_16_2_A, + MoldType_B = trolley_16_2_B + }); + string trolley_17_1_A = asciiEncoding.GetString(info4.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_17_1_B = asciiEncoding.GetString(info4.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =17, + GunNumber =1, + MoldType_A = trolley_17_1_A, + MoldType_B = trolley_17_1_B + }); + string trolley_17_2_A = asciiEncoding.GetString(info4.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_17_2_B = asciiEncoding.GetString(info4.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =17, + GunNumber =2, + MoldType_A = trolley_17_2_A, + MoldType_B = trolley_17_2_B + }); + + string trolley_18_1_A = asciiEncoding.GetString(info4.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_18_1_B = asciiEncoding.GetString(info4.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =18, + GunNumber =1, + MoldType_A = trolley_18_1_A, + MoldType_B = trolley_18_1_B + }); + string trolley_18_2_A = asciiEncoding.GetString(info4.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_18_2_B = asciiEncoding.GetString(info4.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =18, + GunNumber =2, + MoldType_A = trolley_18_2_A, + MoldType_B = trolley_18_2_B + }); + string trolley_19_1_A = asciiEncoding.GetString(info4.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_19_1_B = asciiEncoding.GetString(info4.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =19, + GunNumber =1, + MoldType_A = trolley_19_1_A, + MoldType_B = trolley_19_1_B + }); + string trolley_19_2_A = asciiEncoding.GetString(info4.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_19_2_B = asciiEncoding.GetString(info4.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =19, + GunNumber =2, + MoldType_A = trolley_19_2_A, + MoldType_B = trolley_19_2_B + }); + string trolley_20_1_A = asciiEncoding.GetString(info4.Skip(160).Take(10).ToArray()).Trim('\n'); + string trolley_20_1_B = asciiEncoding.GetString(info4.Skip(170).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =20, + GunNumber =1, + MoldType_A = trolley_20_1_A, + MoldType_B = trolley_20_1_B + }); + string trolley_20_2_A = asciiEncoding.GetString(info4.Skip(180).Take(10).ToArray()).Trim('\n'); + string trolley_20_2_B = asciiEncoding.GetString(info4.Skip(190).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =20, + GunNumber =2, + MoldType_A = trolley_20_2_A, + MoldType_B = trolley_20_2_B + }); + } + #endregion + + byte[] info5 = obj.plc.Read("DB4.942", 200); + + #region 21-25台车 + if(info5 != null) + { + string trolley_21_1_A = asciiEncoding.GetString(info5.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_21_1_B = asciiEncoding.GetString(info5.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =21, + GunNumber =1, + MoldType_A = trolley_21_1_A, + MoldType_B = trolley_21_1_B + }); + + string trolley_21_2_A = asciiEncoding.GetString(info5.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_21_2_B = asciiEncoding.GetString(info5.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =21, + GunNumber =2, + MoldType_A = trolley_21_2_A, + MoldType_B = trolley_21_2_B + }); + string trolley_22_1_A = asciiEncoding.GetString(info5.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_22_1_B = asciiEncoding.GetString(info5.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =22, + GunNumber =1, + MoldType_A = trolley_22_1_A, + MoldType_B = trolley_22_1_B + }); + string trolley_22_2_A = asciiEncoding.GetString(info5.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_22_2_B = asciiEncoding.GetString(info5.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =22, + GunNumber =2, + MoldType_A = trolley_22_2_A, + MoldType_B = trolley_22_2_B + }); + + string trolley_23_1_A = asciiEncoding.GetString(info5.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_23_1_B = asciiEncoding.GetString(info5.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =23, + GunNumber =1, + MoldType_A = trolley_23_1_A, + MoldType_B = trolley_23_1_B + }); + string trolley_23_2_A = asciiEncoding.GetString(info5.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_23_2_B = asciiEncoding.GetString(info5.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =23, + GunNumber =2, + MoldType_A = trolley_23_2_A, + MoldType_B = trolley_23_2_B + }); + string trolley_24_1_A = asciiEncoding.GetString(info5.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_24_1_B = asciiEncoding.GetString(info5.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =24, + GunNumber =1, + MoldType_A = trolley_24_1_A, + MoldType_B = trolley_24_1_B + }); + string trolley_24_2_A = asciiEncoding.GetString(info5.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_24_2_B = asciiEncoding.GetString(info5.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =24, + GunNumber =2, + MoldType_A = trolley_24_2_A, + MoldType_B = trolley_24_2_B + }); + string trolley_25_1_A = asciiEncoding.GetString(info5.Skip(160).Take(10).ToArray()).Trim('\n'); + string trolley_25_1_B = asciiEncoding.GetString(info5.Skip(170).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =25, + GunNumber =1, + MoldType_A = trolley_25_1_A, + MoldType_B = trolley_25_1_B + }); + string trolley_25_2_A = asciiEncoding.GetString(info5.Skip(180).Take(10).ToArray()).Trim('\n'); + string trolley_25_2_B = asciiEncoding.GetString(info5.Skip(190).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =25, + GunNumber =2, + MoldType_A = trolley_25_2_A, + MoldType_B = trolley_25_2_B + }); + } + #endregion + + byte[] info6 = obj.plc.Read("DB4.1142", 200); + + #region 26-30 台车 + if(info6 != null) + { + string trolley_26_1_A = asciiEncoding.GetString(info6.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_26_1_B = asciiEncoding.GetString(info6.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =26, + GunNumber =1, + MoldType_A = trolley_26_1_A, + MoldType_B = trolley_26_1_B + }); + + string trolley_26_2_A = asciiEncoding.GetString(info6.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_26_2_B = asciiEncoding.GetString(info6.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =26, + GunNumber =2, + MoldType_A = trolley_26_2_A, + MoldType_B = trolley_26_2_B + }); + string trolley_27_1_A = asciiEncoding.GetString(info6.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_27_1_B = asciiEncoding.GetString(info6.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =27, + GunNumber =1, + MoldType_A = trolley_27_1_A, + MoldType_B = trolley_27_1_B + }); + string trolley_27_2_A = asciiEncoding.GetString(info6.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_27_2_B = asciiEncoding.GetString(info6.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =27, + GunNumber =2, + MoldType_A = trolley_27_2_A, + MoldType_B = trolley_27_2_B + }); + + string trolley_28_1_A = asciiEncoding.GetString(info6.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_28_1_B = asciiEncoding.GetString(info6.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =28, + GunNumber =1, + MoldType_A = trolley_28_1_A, + MoldType_B = trolley_28_1_B + }); + string trolley_28_2_A = asciiEncoding.GetString(info6.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_28_2_B = asciiEncoding.GetString(info6.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =28, + GunNumber =2, + MoldType_A = trolley_28_2_A, + MoldType_B = trolley_28_2_B + }); + string trolley_29_1_A = asciiEncoding.GetString(info6.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_29_1_B = asciiEncoding.GetString(info6.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =29, + GunNumber =1, + MoldType_A = trolley_29_1_A, + MoldType_B = trolley_29_1_B + }); + string trolley_29_2_A = asciiEncoding.GetString(info6.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_29_2_B = asciiEncoding.GetString(info6.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =29, + GunNumber =2, + MoldType_A = trolley_29_2_A, + MoldType_B = trolley_29_2_B + }); + string trolley_30_1_A = asciiEncoding.GetString(info6.Skip(160).Take(10).ToArray()).Trim('\n'); + string trolley_30_1_B = asciiEncoding.GetString(info6.Skip(170).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =30, + GunNumber =1, + MoldType_A = trolley_30_1_A, + MoldType_B = trolley_30_1_B + }); + string trolley_30_2_A = asciiEncoding.GetString(info6.Skip(180).Take(10).ToArray()).Trim('\n'); + string trolley_30_2_B = asciiEncoding.GetString(info6.Skip(190).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =30, + GunNumber =2, + MoldType_A = trolley_30_2_A, + MoldType_B = trolley_30_2_B + }); + } + #endregion + + byte[] info7 = obj.plc.Read("DB4.1342", 200); + + #region 31-34 台车 + if (info7 != null) + { + string trolley_31_1_A = asciiEncoding.GetString(info7.Skip(0).Take(10).ToArray()).Trim('\n'); + string trolley_31_1_B = asciiEncoding.GetString(info7.Skip(10).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =31, + GunNumber =1, + MoldType_A = trolley_31_1_A, + MoldType_B = trolley_31_1_B + }); + + string trolley_31_2_A = asciiEncoding.GetString(info7.Skip(20).Take(10).ToArray()).Trim('\n'); + string trolley_31_2_B = asciiEncoding.GetString(info7.Skip(30).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =31, + GunNumber =2, + MoldType_A = trolley_31_2_A, + MoldType_B = trolley_31_2_B + }); + string trolley_32_1_A = asciiEncoding.GetString(info7.Skip(40).Take(10).ToArray()).Trim('\n'); + string trolley_32_1_B = asciiEncoding.GetString(info7.Skip(50).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =32, + GunNumber =1, + MoldType_A = trolley_32_1_A, + MoldType_B = trolley_32_1_B + }); + string trolley_32_2_A = asciiEncoding.GetString(info7.Skip(60).Take(10).ToArray()).Trim('\n'); + string trolley_32_2_B = asciiEncoding.GetString(info7.Skip(70).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =32, + GunNumber =2, + MoldType_A = trolley_32_2_A, + MoldType_B = trolley_32_2_B + }); + + string trolley_33_1_A = asciiEncoding.GetString(info7.Skip(80).Take(10).ToArray()).Trim('\n'); + string trolley_33_1_B = asciiEncoding.GetString(info7.Skip(90).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =33, + GunNumber =1, + MoldType_A = trolley_33_1_A, + MoldType_B = trolley_33_1_B + }); + string trolley_33_2_A = asciiEncoding.GetString(info7.Skip(100).Take(10).ToArray()).Trim('\n'); + string trolley_33_2_B = asciiEncoding.GetString(info7.Skip(110).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =33, + GunNumber =2, + MoldType_A = trolley_33_2_A, + MoldType_B = trolley_33_2_B + }); + string trolley_34_1_A = asciiEncoding.GetString(info7.Skip(120).Take(10).ToArray()).Trim('\n'); + string trolley_34_1_B = asciiEncoding.GetString(info7.Skip(130).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =34, + GunNumber =1, + MoldType_A = trolley_34_1_A, + MoldType_B = trolley_34_1_B + }); + string trolley_34_2_A = asciiEncoding.GetString(info7.Skip(140).Take(10).ToArray()).Trim('\n'); + string trolley_34_2_B = asciiEncoding.GetString(info7.Skip(150).Take(10).ToArray()).Trim('\n'); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =34, + GunNumber =2, + MoldType_A = trolley_34_2_A, + MoldType_B = trolley_34_2_B + }); + } + #endregion } + + return doorFoams; } } /// @@ -260,60 +1369,661 @@ namespace Aucma.Core.DoorFoam.Business /// /// 读取模位产量1-10 ,10-20,20-30 /// - static void ReadModeProduct(HwPLc.PlcModel obj, string startStr, List boxTypeList) + static List ReadModeProduct(HwPLc.PlcModel obj) { - if (obj == null) return; + if (obj == null) return null; else { + List doorFoams = new List(); if (obj.plc.IsConnected) { - byte[] info = obj.plc.Read(startStr, 160); - if (info == null) return; - //1#台车1#枪A门,1#台车1#枪B门,1#台车2#枪A门,1#台车2#枪B门 - int temp1 = int.Parse(StringChange.bytesToHexStr(info.Skip(0).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp2 = int.Parse(StringChange.bytesToHexStr(info.Skip(4).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp3 = int.Parse(StringChange.bytesToHexStr(info.Skip(8).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp4 = int.Parse(StringChange.bytesToHexStr(info.Skip(12).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp5 = int.Parse(StringChange.bytesToHexStr(info.Skip(16).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp6 = int.Parse(StringChange.bytesToHexStr(info.Skip(20).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp7 = int.Parse(StringChange.bytesToHexStr(info.Skip(24).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp8 = int.Parse(StringChange.bytesToHexStr(info.Skip(28).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp9 = int.Parse(StringChange.bytesToHexStr(info.Skip(32).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp10 = int.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp11 = int.Parse(StringChange.bytesToHexStr(info.Skip(40).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp12 = int.Parse(StringChange.bytesToHexStr(info.Skip(44).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp13 = int.Parse(StringChange.bytesToHexStr(info.Skip(48).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp14 = int.Parse(StringChange.bytesToHexStr(info.Skip(52).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp15 = int.Parse(StringChange.bytesToHexStr(info.Skip(56).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp16 = int.Parse(StringChange.bytesToHexStr(info.Skip(60).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp17 = int.Parse(StringChange.bytesToHexStr(info.Skip(64).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp18 = int.Parse(StringChange.bytesToHexStr(info.Skip(68).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp19 = int.Parse(StringChange.bytesToHexStr(info.Skip(72).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp20 = int.Parse(StringChange.bytesToHexStr(info.Skip(76).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp21 = int.Parse(StringChange.bytesToHexStr(info.Skip(80).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp22 = int.Parse(StringChange.bytesToHexStr(info.Skip(84).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp23 = int.Parse(StringChange.bytesToHexStr(info.Skip(88).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp24 = int.Parse(StringChange.bytesToHexStr(info.Skip(92).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp25 = int.Parse(StringChange.bytesToHexStr(info.Skip(96).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp26 = int.Parse(StringChange.bytesToHexStr(info.Skip(100).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp27 = int.Parse(StringChange.bytesToHexStr(info.Skip(104).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp28 = int.Parse(StringChange.bytesToHexStr(info.Skip(108).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp29 = int.Parse(StringChange.bytesToHexStr(info.Skip(112).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp30 = int.Parse(StringChange.bytesToHexStr(info.Skip(116).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp31 = int.Parse(StringChange.bytesToHexStr(info.Skip(120).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp32 = int.Parse(StringChange.bytesToHexStr(info.Skip(124).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp33 = int.Parse(StringChange.bytesToHexStr(info.Skip(128).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp34 = int.Parse(StringChange.bytesToHexStr(info.Skip(132).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp35 = int.Parse(StringChange.bytesToHexStr(info.Skip(136).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp36 = int.Parse(StringChange.bytesToHexStr(info.Skip(140).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp37 = int.Parse(StringChange.bytesToHexStr(info.Skip(144).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp38 = int.Parse(StringChange.bytesToHexStr(info.Skip(148).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp39 = int.Parse(StringChange.bytesToHexStr(info.Skip(152).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - int temp40 = int.Parse(StringChange.bytesToHexStr(info.Skip(156).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); - - Console.WriteLine(temp16); + byte[] info = obj.plc.Read("DB4.1542", 160); + #region 1-10台车产量 + if (info != null) + { + //1#台车1#枪A门,1#台车1#枪B门,1#台车2#枪A门,1#台车2#枪B门 + int temp1 = int.Parse(StringChange.bytesToHexStr(info.Skip(0).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp2 = int.Parse(StringChange.bytesToHexStr(info.Skip(4).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =1, + GunNumber =1, + MoldProdutionA = temp1.ToString(), + MoldProdutionB = temp2.ToString() + }); + int temp3 = int.Parse(StringChange.bytesToHexStr(info.Skip(8).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp4 = int.Parse(StringChange.bytesToHexStr(info.Skip(12).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =1, + GunNumber =2, + MoldProdutionA = temp3.ToString(), + MoldProdutionB = temp4.ToString() + }); + int temp5 = int.Parse(StringChange.bytesToHexStr(info.Skip(16).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp6 = int.Parse(StringChange.bytesToHexStr(info.Skip(20).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =2, + GunNumber =1, + MoldProdutionA = temp5.ToString(), + MoldProdutionB = temp6.ToString() + }); + int temp7 = int.Parse(StringChange.bytesToHexStr(info.Skip(24).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp8 = int.Parse(StringChange.bytesToHexStr(info.Skip(28).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =2, + GunNumber =2, + MoldProdutionA = temp7.ToString(), + MoldProdutionB = temp8.ToString() + }); + int temp9 = int.Parse(StringChange.bytesToHexStr(info.Skip(32).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp10 = int.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =3, + GunNumber =1, + MoldProdutionA = temp9.ToString(), + MoldProdutionB = temp10.ToString() + }); + int temp11 = int.Parse(StringChange.bytesToHexStr(info.Skip(40).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp12 = int.Parse(StringChange.bytesToHexStr(info.Skip(44).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =3, + GunNumber =2, + MoldProdutionA = temp11.ToString(), + MoldProdutionB = temp12.ToString() + }); + int temp13 = int.Parse(StringChange.bytesToHexStr(info.Skip(48).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp14 = int.Parse(StringChange.bytesToHexStr(info.Skip(52).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =4, + GunNumber =1, + MoldProdutionA = temp13.ToString(), + MoldProdutionB = temp14.ToString() + }); + int temp15 = int.Parse(StringChange.bytesToHexStr(info.Skip(56).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp16 = int.Parse(StringChange.bytesToHexStr(info.Skip(60).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =4, + GunNumber =2, + MoldProdutionA = temp15.ToString(), + MoldProdutionB = temp16.ToString() + }); + int temp17 = int.Parse(StringChange.bytesToHexStr(info.Skip(64).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp18 = int.Parse(StringChange.bytesToHexStr(info.Skip(68).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =5, + GunNumber =1, + MoldProdutionA = temp17.ToString(), + MoldProdutionB = temp18.ToString() + }); + int temp19 = int.Parse(StringChange.bytesToHexStr(info.Skip(72).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp20 = int.Parse(StringChange.bytesToHexStr(info.Skip(76).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =5, + GunNumber =2, + MoldProdutionA = temp19.ToString(), + MoldProdutionB = temp20.ToString() + }); + int temp21 = int.Parse(StringChange.bytesToHexStr(info.Skip(80).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp22 = int.Parse(StringChange.bytesToHexStr(info.Skip(84).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =6, + GunNumber =1, + MoldProdutionA = temp21.ToString(), + MoldProdutionB = temp22.ToString() + }); + int temp23 = int.Parse(StringChange.bytesToHexStr(info.Skip(88).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp24 = int.Parse(StringChange.bytesToHexStr(info.Skip(92).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =6, + GunNumber =2, + MoldProdutionA = temp23.ToString(), + MoldProdutionB = temp24.ToString() + }); + int temp25 = int.Parse(StringChange.bytesToHexStr(info.Skip(96).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp26 = int.Parse(StringChange.bytesToHexStr(info.Skip(100).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =7, + GunNumber =1, + MoldProdutionA = temp25.ToString(), + MoldProdutionB = temp26.ToString() + }); + int temp27 = int.Parse(StringChange.bytesToHexStr(info.Skip(104).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp28 = int.Parse(StringChange.bytesToHexStr(info.Skip(108).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =7, + GunNumber =2, + MoldProdutionA = temp27.ToString(), + MoldProdutionB = temp28.ToString() + }); + int temp29 = int.Parse(StringChange.bytesToHexStr(info.Skip(112).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp30 = int.Parse(StringChange.bytesToHexStr(info.Skip(116).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =8, + GunNumber =1, + MoldProdutionA = temp29.ToString(), + MoldProdutionB = temp30.ToString() + }); + int temp31 = int.Parse(StringChange.bytesToHexStr(info.Skip(120).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp32 = int.Parse(StringChange.bytesToHexStr(info.Skip(124).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =8, + GunNumber =2, + MoldProdutionA = temp31.ToString(), + MoldProdutionB = temp32.ToString() + }); + int temp33 = int.Parse(StringChange.bytesToHexStr(info.Skip(128).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp34 = int.Parse(StringChange.bytesToHexStr(info.Skip(132).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =9, + GunNumber =1, + MoldProdutionA = temp33.ToString(), + MoldProdutionB = temp34.ToString() + }); + int temp35 = int.Parse(StringChange.bytesToHexStr(info.Skip(136).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp36 = int.Parse(StringChange.bytesToHexStr(info.Skip(140).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =9, + GunNumber =2, + MoldProdutionA = temp35.ToString(), + MoldProdutionB = temp36.ToString() + }); + int temp37 = int.Parse(StringChange.bytesToHexStr(info.Skip(144).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp38 = int.Parse(StringChange.bytesToHexStr(info.Skip(148).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =10, + GunNumber =1, + MoldProdutionA = temp37.ToString(), + MoldProdutionB = temp38.ToString() + }); + int temp39 = int.Parse(StringChange.bytesToHexStr(info.Skip(152).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp40 = int.Parse(StringChange.bytesToHexStr(info.Skip(156).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =10, + GunNumber =2, + MoldProdutionA = temp39.ToString(), + MoldProdutionB = temp40.ToString() + }); + } + #endregion + + byte[] info2 = obj.plc.Read("DB4.1702", 160); + #region 11-20台车产量 + if (info2 != null) + { + int temp1 = int.Parse(StringChange.bytesToHexStr(info2.Skip(0).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp2 = int.Parse(StringChange.bytesToHexStr(info2.Skip(4).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =11, + GunNumber =1, + MoldProdutionA = temp1.ToString(), + MoldProdutionB = temp2.ToString() + }); + int temp3 = int.Parse(StringChange.bytesToHexStr(info2.Skip(8).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp4 = int.Parse(StringChange.bytesToHexStr(info2.Skip(12).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =11, + GunNumber =2, + MoldProdutionA = temp3.ToString(), + MoldProdutionB = temp4.ToString() + }); + int temp5 = int.Parse(StringChange.bytesToHexStr(info2.Skip(16).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp6 = int.Parse(StringChange.bytesToHexStr(info2.Skip(20).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =12, + GunNumber =1, + MoldProdutionA = temp5.ToString(), + MoldProdutionB = temp6.ToString() + }); + int temp7 = int.Parse(StringChange.bytesToHexStr(info2.Skip(24).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp8 = int.Parse(StringChange.bytesToHexStr(info2.Skip(28).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =12, + GunNumber =2, + MoldProdutionA = temp7.ToString(), + MoldProdutionB = temp8.ToString() + }); + int temp9 = int.Parse(StringChange.bytesToHexStr(info2.Skip(32).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp10 = int.Parse(StringChange.bytesToHexStr(info2.Skip(36).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =13, + GunNumber =1, + MoldProdutionA = temp9.ToString(), + MoldProdutionB = temp10.ToString() + }); + int temp11 = int.Parse(StringChange.bytesToHexStr(info2.Skip(40).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp12 = int.Parse(StringChange.bytesToHexStr(info2.Skip(44).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =13, + GunNumber =2, + MoldProdutionA = temp11.ToString(), + MoldProdutionB = temp12.ToString() + }); + int temp13 = int.Parse(StringChange.bytesToHexStr(info2.Skip(48).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp14 = int.Parse(StringChange.bytesToHexStr(info2.Skip(52).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =14, + GunNumber =1, + MoldProdutionA = temp13.ToString(), + MoldProdutionB = temp14.ToString() + }); + int temp15 = int.Parse(StringChange.bytesToHexStr(info2.Skip(56).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp16 = int.Parse(StringChange.bytesToHexStr(info2.Skip(60).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =14, + GunNumber =2, + MoldProdutionA = temp15.ToString(), + MoldProdutionB = temp16.ToString() + }); + int temp17 = int.Parse(StringChange.bytesToHexStr(info2.Skip(64).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp18 = int.Parse(StringChange.bytesToHexStr(info2.Skip(68).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =15, + GunNumber =1, + MoldProdutionA = temp17.ToString(), + MoldProdutionB = temp18.ToString() + }); + int temp19 = int.Parse(StringChange.bytesToHexStr(info2.Skip(72).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp20 = int.Parse(StringChange.bytesToHexStr(info2.Skip(76).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =15, + GunNumber =2, + MoldProdutionA = temp19.ToString(), + MoldProdutionB = temp20.ToString() + }); + int temp21 = int.Parse(StringChange.bytesToHexStr(info2.Skip(80).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp22 = int.Parse(StringChange.bytesToHexStr(info2.Skip(84).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =16, + GunNumber =1, + MoldProdutionA = temp21.ToString(), + MoldProdutionB = temp22.ToString() + }); + int temp23 = int.Parse(StringChange.bytesToHexStr(info2.Skip(88).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp24 = int.Parse(StringChange.bytesToHexStr(info2.Skip(92).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =16, + GunNumber =2, + MoldProdutionA = temp23.ToString(), + MoldProdutionB = temp24.ToString() + }); + int temp25 = int.Parse(StringChange.bytesToHexStr(info2.Skip(96).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp26 = int.Parse(StringChange.bytesToHexStr(info2.Skip(100).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =17, + GunNumber =1, + MoldProdutionA = temp25.ToString(), + MoldProdutionB = temp26.ToString() + }); + int temp27 = int.Parse(StringChange.bytesToHexStr(info2.Skip(104).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp28 = int.Parse(StringChange.bytesToHexStr(info2.Skip(108).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =17, + GunNumber =2, + MoldProdutionA = temp27.ToString(), + MoldProdutionB = temp28.ToString() + }); + int temp29 = int.Parse(StringChange.bytesToHexStr(info2.Skip(112).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp30 = int.Parse(StringChange.bytesToHexStr(info2.Skip(116).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =18, + GunNumber =1, + MoldProdutionA = temp29.ToString(), + MoldProdutionB = temp30.ToString() + }); + int temp31 = int.Parse(StringChange.bytesToHexStr(info2.Skip(120).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp32 = int.Parse(StringChange.bytesToHexStr(info2.Skip(124).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =18, + GunNumber =2, + MoldProdutionA = temp31.ToString(), + MoldProdutionB = temp32.ToString() + }); + int temp33 = int.Parse(StringChange.bytesToHexStr(info2.Skip(128).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp34 = int.Parse(StringChange.bytesToHexStr(info2.Skip(132).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =19, + GunNumber =1, + MoldProdutionA = temp33.ToString(), + MoldProdutionB = temp34.ToString() + }); + int temp35 = int.Parse(StringChange.bytesToHexStr(info2.Skip(136).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp36 = int.Parse(StringChange.bytesToHexStr(info2.Skip(140).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =19, + GunNumber =2, + MoldProdutionA = temp35.ToString(), + MoldProdutionB = temp36.ToString() + }); + int temp37 = int.Parse(StringChange.bytesToHexStr(info2.Skip(144).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp38 = int.Parse(StringChange.bytesToHexStr(info2.Skip(148).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =20, + GunNumber =1, + MoldProdutionA = temp37.ToString(), + MoldProdutionB = temp38.ToString() + }); + int temp39 = int.Parse(StringChange.bytesToHexStr(info2.Skip(152).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp40 = int.Parse(StringChange.bytesToHexStr(info2.Skip(156).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =20, + GunNumber =2, + MoldProdutionA = temp39.ToString(), + MoldProdutionB = temp40.ToString() + }); + } + #endregion + byte[] info3 = obj.plc.Read("DB4.1862", 160); + #region 21-30台车产量 + if (info3 != null) + { + int temp1 = int.Parse(StringChange.bytesToHexStr(info3.Skip(0).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp2 = int.Parse(StringChange.bytesToHexStr(info3.Skip(4).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =21, + GunNumber =1, + MoldProdutionA = temp1.ToString(), + MoldProdutionB = temp2.ToString() + }); + int temp3 = int.Parse(StringChange.bytesToHexStr(info3.Skip(8).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp4 = int.Parse(StringChange.bytesToHexStr(info3.Skip(12).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =21, + GunNumber =2, + MoldProdutionA = temp3.ToString(), + MoldProdutionB = temp4.ToString() + }); + int temp5 = int.Parse(StringChange.bytesToHexStr(info3.Skip(16).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp6 = int.Parse(StringChange.bytesToHexStr(info3.Skip(20).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =22, + GunNumber =1, + MoldProdutionA = temp5.ToString(), + MoldProdutionB = temp6.ToString() + }); + int temp7 = int.Parse(StringChange.bytesToHexStr(info3.Skip(24).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp8 = int.Parse(StringChange.bytesToHexStr(info3.Skip(28).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =22, + GunNumber =2, + MoldProdutionA = temp7.ToString(), + MoldProdutionB = temp8.ToString() + }); + int temp9 = int.Parse(StringChange.bytesToHexStr(info3.Skip(32).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp10 = int.Parse(StringChange.bytesToHexStr(info3.Skip(36).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =23, + GunNumber =1, + MoldProdutionA = temp9.ToString(), + MoldProdutionB = temp10.ToString() + }); + int temp11 = int.Parse(StringChange.bytesToHexStr(info3.Skip(40).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp12 = int.Parse(StringChange.bytesToHexStr(info3.Skip(44).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =23, + GunNumber =2, + MoldProdutionA = temp11.ToString(), + MoldProdutionB = temp12.ToString() + }); + int temp13 = int.Parse(StringChange.bytesToHexStr(info3.Skip(48).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp14 = int.Parse(StringChange.bytesToHexStr(info3.Skip(52).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =24, + GunNumber =1, + MoldProdutionA = temp13.ToString(), + MoldProdutionB = temp14.ToString() + }); + int temp15 = int.Parse(StringChange.bytesToHexStr(info3.Skip(56).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp16 = int.Parse(StringChange.bytesToHexStr(info3.Skip(60).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =24, + GunNumber =2, + MoldProdutionA = temp15.ToString(), + MoldProdutionB = temp16.ToString() + }); + int temp17 = int.Parse(StringChange.bytesToHexStr(info3.Skip(64).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp18 = int.Parse(StringChange.bytesToHexStr(info3.Skip(68).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =25, + GunNumber =1, + MoldProdutionA = temp17.ToString(), + MoldProdutionB = temp18.ToString() + }); + int temp19 = int.Parse(StringChange.bytesToHexStr(info3.Skip(72).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp20 = int.Parse(StringChange.bytesToHexStr(info3.Skip(76).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =25, + GunNumber =2, + MoldProdutionA = temp19.ToString(), + MoldProdutionB = temp20.ToString() + }); + int temp21 = int.Parse(StringChange.bytesToHexStr(info3.Skip(80).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp22 = int.Parse(StringChange.bytesToHexStr(info3.Skip(84).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =26, + GunNumber =1, + MoldProdutionA = temp21.ToString(), + MoldProdutionB = temp22.ToString() + }); + int temp23 = int.Parse(StringChange.bytesToHexStr(info3.Skip(88).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp24 = int.Parse(StringChange.bytesToHexStr(info3.Skip(92).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =26, + GunNumber =2, + MoldProdutionA = temp23.ToString(), + MoldProdutionB = temp24.ToString() + }); + int temp25 = int.Parse(StringChange.bytesToHexStr(info3.Skip(96).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp26 = int.Parse(StringChange.bytesToHexStr(info3.Skip(100).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =27, + GunNumber =1, + MoldProdutionA = temp25.ToString(), + MoldProdutionB = temp26.ToString() + }); + int temp27 = int.Parse(StringChange.bytesToHexStr(info3.Skip(104).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp28 = int.Parse(StringChange.bytesToHexStr(info3.Skip(108).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =27, + GunNumber =2, + MoldProdutionA = temp27.ToString(), + MoldProdutionB = temp28.ToString() + }); + int temp29 = int.Parse(StringChange.bytesToHexStr(info3.Skip(112).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp30 = int.Parse(StringChange.bytesToHexStr(info3.Skip(116).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =28, + GunNumber =1, + MoldProdutionA = temp29.ToString(), + MoldProdutionB = temp30.ToString() + }); + int temp31 = int.Parse(StringChange.bytesToHexStr(info3.Skip(120).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp32 = int.Parse(StringChange.bytesToHexStr(info3.Skip(124).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =28, + GunNumber =2, + MoldProdutionA = temp31.ToString(), + MoldProdutionB = temp32.ToString() + }); + int temp33 = int.Parse(StringChange.bytesToHexStr(info3.Skip(128).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp34 = int.Parse(StringChange.bytesToHexStr(info3.Skip(132).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =29, + GunNumber =1, + MoldProdutionA = temp33.ToString(), + MoldProdutionB = temp34.ToString() + }); + int temp35 = int.Parse(StringChange.bytesToHexStr(info3.Skip(136).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp36 = int.Parse(StringChange.bytesToHexStr(info3.Skip(140).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =29, + GunNumber =2, + MoldProdutionA = temp35.ToString(), + MoldProdutionB = temp36.ToString() + }); + int temp37 = int.Parse(StringChange.bytesToHexStr(info3.Skip(144).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp38 = int.Parse(StringChange.bytesToHexStr(info3.Skip(148).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =30, + GunNumber =1, + MoldProdutionA = temp37.ToString(), + MoldProdutionB = temp38.ToString() + }); + int temp39 = int.Parse(StringChange.bytesToHexStr(info3.Skip(152).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp40 = int.Parse(StringChange.bytesToHexStr(info3.Skip(156).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =30, + GunNumber =2, + MoldProdutionA = temp39.ToString(), + MoldProdutionB = temp40.ToString() + }); + } + #endregion + + byte[] info4 = obj.plc.Read("DB4.2022", 160); + #region 31-34台车产量 + if (info4 != null) + { + int temp1 = int.Parse(StringChange.bytesToHexStr(info4.Skip(0).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp2 = int.Parse(StringChange.bytesToHexStr(info4.Skip(4).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =31, + GunNumber =1, + MoldProdutionA = temp1.ToString(), + MoldProdutionB = temp2.ToString() + }); + int temp3 = int.Parse(StringChange.bytesToHexStr(info4.Skip(8).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp4 = int.Parse(StringChange.bytesToHexStr(info4.Skip(12).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =31, + GunNumber =2, + MoldProdutionA = temp3.ToString(), + MoldProdutionB = temp4.ToString() + }); + int temp5 = int.Parse(StringChange.bytesToHexStr(info4.Skip(16).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp6 = int.Parse(StringChange.bytesToHexStr(info4.Skip(20).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =32, + GunNumber =1, + MoldProdutionA = temp5.ToString(), + MoldProdutionB = temp6.ToString() + }); + int temp7 = int.Parse(StringChange.bytesToHexStr(info4.Skip(24).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp8 = int.Parse(StringChange.bytesToHexStr(info4.Skip(28).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =32, + GunNumber =2, + MoldProdutionA = temp7.ToString(), + MoldProdutionB = temp8.ToString() + }); + int temp9 = int.Parse(StringChange.bytesToHexStr(info4.Skip(32).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp10 = int.Parse(StringChange.bytesToHexStr(info4.Skip(36).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =33, + GunNumber =1, + MoldProdutionA = temp9.ToString(), + MoldProdutionB = temp10.ToString() + }); + int temp11 = int.Parse(StringChange.bytesToHexStr(info4.Skip(40).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp12 = int.Parse(StringChange.bytesToHexStr(info4.Skip(44).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =33, + GunNumber =2, + MoldProdutionA = temp11.ToString(), + MoldProdutionB = temp12.ToString() + }); + int temp13 = int.Parse(StringChange.bytesToHexStr(info4.Skip(48).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp14 = int.Parse(StringChange.bytesToHexStr(info4.Skip(52).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =34, + GunNumber =1, + MoldProdutionA = temp13.ToString(), + MoldProdutionB = temp14.ToString() + }); + int temp15 = int.Parse(StringChange.bytesToHexStr(info4.Skip(56).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + int temp16 = int.Parse(StringChange.bytesToHexStr(info4.Skip(60).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); + doorFoams.Add(new DoorFoamMachine() + { + StationTrolleyNumber =34, + GunNumber =2, + MoldProdutionA = temp15.ToString(), + MoldProdutionB = temp16.ToString() + }); + } + #endregion } + + return doorFoams; } } @@ -444,31 +2154,31 @@ namespace Aucma.Core.DoorFoam.Business { item1 = 1; // } - else if (str1.Substring(1, 1) == "1") + else if (str1.Substring(1, 1) =="1") { item1 = 2; // } - else if (str1.Substring(2, 1) == "1") + else if (str1.Substring(2, 1) =="1") { item1 = 3; // } - else if (str1.Substring(3, 1) == "1") + else if (str1.Substring(3, 1) =="1") { item1 = 4; // } - else if (str1.Substring(4, 1) == "1") + else if (str1.Substring(4, 1) =="1") { item1 = 5; // } - else if (str1.Substring(5, 1) == "1") + else if (str1.Substring(5, 1) =="1") { item1 = 6; // } - else if (str1.Substring(6, 1) == "1") + else if (str1.Substring(6, 1) =="1") { item1 = 7; // } - else if (str1.Substring(7, 1) == "1") + else if (str1.Substring(7, 1) =="1") { item1 = 8; // } diff --git a/Aucma.Core.DoorFoam/ConvertTo/DeviceCodeConverter.cs b/Aucma.Core.DoorFoam/ConvertTo/DeviceCodeConverter.cs new file mode 100644 index 00000000..d4969f86 --- /dev/null +++ b/Aucma.Core.DoorFoam/ConvertTo/DeviceCodeConverter.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace Aucma.Core.DoorFoam.ConvertTo +{ + public class DeviceCodeConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value == null) + { + return false; + } + else + { + int info = (int)value; + return $"{info}#"; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs index 1d71e222..516ffd23 100644 --- a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs @@ -16,6 +16,12 @@ using Admin.Core.Model.ViewModels; using Pipelines.Sockets.Unofficial.Arenas; using NPOI.SS.Formula.Functions; using Aucma.Core.DoorFoam.Models; +using Aucma.Core.DoorFoam.Business; +using System.Threading; +using System.Collections; +using NPOI.Util; +using SqlSugar; +using System.Linq; /* * 首页信息 */ @@ -24,9 +30,20 @@ namespace Aucma.Core.DoorFoam.ViewModels public partial class IndexPageViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel)); + + private DoorCollection doorCollection = new DoorCollection(); public IndexPageViewModel() { + doorCollection.RefreshDoorFoamMachineEvent += info => + { + RefreshDoorFoamMachineDataGrid(info); + }; + Task.Run(() => + { + Thread.Sleep(30000); + doorCollection.startCollect(); + }); } #region 获取今天的数据 @@ -96,5 +113,45 @@ namespace Aucma.Core.DoorFoam.ViewModels SetProperty(ref _stationName, value); } } + + private ObservableCollection dataGridItemLeft = new ObservableCollection(); + + private IEnumerable doorFoamMachineDataGrid_Left; + + public IEnumerable DoorFoamMachineDataGrid_Left + { + get { return doorFoamMachineDataGrid_Left; } + set { doorFoamMachineDataGrid_Left = value; OnPropertyChanged(); } + + } + + private ObservableCollection dataGridItemRight = new ObservableCollection(); + + private IEnumerable doorFoamMachineDataGrid_Right; + + public IEnumerable DoorFoamMachineDataGrid_Right + { + get { return doorFoamMachineDataGrid_Right; } + set { doorFoamMachineDataGrid_Right = value; OnPropertyChanged(); } + + } + + private void RefreshDoorFoamMachineDataGrid(List data) + { + dataGridItemLeft = new ObservableCollection(); + + int totalItems = data.Count; + int half = totalItems / 2; + + List doorFoamMachineLeft = data.Take(half).ToList(); + List doorFoamMachineRight = data.Skip(half).ToList(); + + + doorFoamMachineLeft.ForEach(x=> dataGridItemLeft.Add(x)); + DoorFoamMachineDataGrid_Left = dataGridItemLeft; + + doorFoamMachineRight.ForEach(x=>dataGridItemRight.Add(x)); + DoorFoamMachineDataGrid_Right = doorFoamMachineRight; + } } } diff --git a/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs index 90079006..31bbd5c7 100644 --- a/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs +++ b/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs @@ -23,6 +23,9 @@ using log4net; using System.Collections; using System.Windows.Documents; using NPOI.SS.Formula.Functions; +using Microsoft.Extensions.FileSystemGlobbing.Internal; +using System.Text.RegularExpressions; +using System.Windows.Controls; namespace Aucma.Core.DoorFoam.ViewModels { @@ -52,27 +55,41 @@ namespace Aucma.Core.DoorFoam.ViewModels /// private void InitEveryDayMethodAsync() { + ChartValues achievement = new ChartValues(); - Random random = new Random(); - for (int i = 0; i < 2; i++) - { - achievement.Add(random.Next(0, 50)); - } - ModelStatistics.Add(new ColumnSeries() - { - DataLabels = true, - Title = "型号", - Values = achievement, - Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)), - Foreground = Brushes.White, - FontSize = 18 - }); - - MaterialNameList = new List() + MaterialNameList = new List(); + + var info = _doorMateHistoryServices.Query(x => x.ScanTime.ToString("yyyy-MM-dd").Contains(DateTime.Now.ToString("yyyy-MM-dd"))); + + App.Current.Dispatcher.BeginInvoke((Action)(() => { - "BCD-287CHN", - "BCD-287CHN" - }; + ModelStatistics.Clear(); + + if (info != null) + { + var groupResult = from p in info + group p by p.MaterialName into g + select new { MaterialName = g.Key, Count = g.Count() }; + foreach (var groupItem in groupResult) + { + achievement.Add(groupItem.Count); + + MaterialNameList.Add(FormatMaterialType(groupItem.MaterialName)); + } + } + + ModelStatistics.Add(new ColumnSeries() + { + DataLabels = true, + Title = "型号", + Values = achievement, + Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)), + Foreground = Brushes.White, + FontSize = 18 + }); + })); + + } @@ -190,6 +207,8 @@ namespace Aucma.Core.DoorFoam.ViewModels #endregion #region 门体匹配队列 + + private int i = 0; /// /// 门体匹配队列 /// @@ -210,15 +229,20 @@ namespace Aucma.Core.DoorFoam.ViewModels DoorMateHistory model = new DoorMateHistory(); if (planInfoDataGrid.Count() == 0) model.ObjId = 1; else model.ObjId = planInfoDataGrid.Count() + 1; - + model.PlanCode = stationPlan.PlanCode; model.OrderCode = stationPlan.OrderCode; model.MaterialCode = stationPlan.MaterialCode; model.MaterialName = stationPlan.MaterialName; model.ScanTime = DateTime.Now; - planInfoDataGrid.Insert(0, model); SaveMateHistory(code,obj, productLineCode, plan, model); + model.MaterialName = this.FormatMaterialType(stationPlan.MaterialName); + model.ObjId = i+1; + planInfoDataGrid.Insert(0, model); + + InitEveryDayMethodAsync();//刷新型号统计图表 + } #region 记录历史 @@ -311,5 +335,28 @@ namespace Aucma.Core.DoorFoam.ViewModels return result; } #endregion + + + /// + /// 格式化物料类型 + /// + /// + /// + private string FormatMaterialType(string materialType) + { + string result = ""; + System.Text.RegularExpressions.Match match = Regex.Match(materialType, @".*?,(.*?),"); + + if (match.Success && match.Groups.Count > 1) + { + result = match.Groups[1].Value; + } + else + { + result = materialType; + } + + return result; + } } } diff --git a/Aucma.Core.DoorFoam/Views/IndexPageView.xaml b/Aucma.Core.DoorFoam/Views/IndexPageView.xaml index e5009527..4676f9a5 100644 --- a/Aucma.Core.DoorFoam/Views/IndexPageView.xaml +++ b/Aucma.Core.DoorFoam/Views/IndexPageView.xaml @@ -5,13 +5,15 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:local="clr-namespace:Aucma.Core.DoorFoam.Views" + xmlns:local1="clr-namespace:Aucma.Core.DoorFoam.ConvertTo" mc:Ignorable="d" d:DesignHeight="800" d:DesignWidth="1000" > + @@ -107,7 +108,11 @@ - + + + + + @@ -133,12 +138,12 @@ RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" - Foreground="White"> + Foreground="White" > - - - + + + @@ -174,7 +179,7 @@ - + diff --git a/Aucma.Core.DoorFoam/appsettings.json b/Aucma.Core.DoorFoam/appsettings.json index e1789de9..03a7fd33 100644 --- a/Aucma.Core.DoorFoam/appsettings.json +++ b/Aucma.Core.DoorFoam/appsettings.json @@ -209,7 +209,7 @@ "Id": 2, "EquipName": "DoorPlc", "PlcType": "Siemens", - "Enabled": false, + "Enabled": true, "IP": "127.0.0.1", "Port": 102 } diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll index bb9cc798..914b0885 100644 Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll differ diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb index e11f8d6b..afa0f38e 100644 Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index 36288f46..57f88858 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index a4db58d9..54fddce2 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index a056af0d..decde3af 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache index 303b31a5..eeabcb64 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache @@ -4,7 +4,7 @@ library C# .cs -D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\ +E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\ HwControlLib none false @@ -13,7 +13,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP 1204305769 71208292394 -194-2067936865 +194-1617825143 Themes\Generic.xaml; False diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json index 8d86e7ef..7ff994f6 100644 --- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json +++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json @@ -1,28 +1,33 @@ { "format": 1, "restore": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {} + "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {} }, "projects": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": { + "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -58,7 +63,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props index d4531802..7eb906eb 100644 --- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props +++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props @@ -5,11 +5,13 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index 57c51ab1..1558f2be 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,27 +8,34 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -64,7 +71,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 7ca2e0be..248dc48c 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==", + "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==", "success": true, - "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file