diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 441f7753..d35a8860 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -2356,6 +2356,16 @@ 产品简码 + + + 夹具型号 + + + + + y + + 条码下线信息记录 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 fe5e8758..0a98b80a 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,46 +1,41 @@ { "format": 1, "restore": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.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.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.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\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -83,41 +78,36 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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" + "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" } } } @@ -273,41 +263,36 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -347,65 +332,60 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.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.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.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.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.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.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.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\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.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.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.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.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.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.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.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" } } } @@ -441,44 +421,39 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.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.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -508,44 +483,39 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.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.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -575,41 +545,36 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -639,41 +604,36 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -703,34 +663,29 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -793,47 +748,42 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.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\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.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" } } } @@ -863,53 +813,48 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.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.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.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.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.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.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.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.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -945,34 +890,29 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1011,34 +951,29 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1077,44 +1012,39 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.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.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1144,41 +1074,36 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1214,41 +1139,36 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1284,47 +1204,42 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.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\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.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.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1354,7 +1269,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\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 15920027..a5a55588 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,20 +5,18 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\admin\.nuget\packages\ PackageReference - 6.5.0 + 6.7.0 - - - + - C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\admin\.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 d1d06cea..601c80d9 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 = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = D:\Project\gitea\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 d8850da5..d57995ef 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 209a19d7..6f928a74 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -7052,11 +7052,12 @@ ] }, "System.Collections.NonGeneric/4.3.0": { - "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==", + "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", "type": "package", "path": "system.collections.nongeneric/4.3.0", "files": [ ".nupkg.metadata", + ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -9789,11 +9790,12 @@ ] }, "System.Runtime.Serialization.Primitives/4.3.0": { - "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==", + "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", "type": "package", "path": "system.runtime.serialization.primitives/4.3.0", "files": [ ".nupkg.metadata", + ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -11255,47 +11257,40 @@ ] }, "packageFolders": { - "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\admin\\.nuget\\packages\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "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\\", + "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\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.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.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.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\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -11338,7 +11333,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index c8cd40d1..66791f7b 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,233 +1,233 @@ { "version": 2, - "dgSpecHash": "HsMojseCVmTxRPG4iGkEf/2OvAGUxYsYPY9resKB+wCYzU12wwdfiUulJ6iIYjBrrvQkt9KbYTYesAxpAJXRFg==", + "dgSpecHash": "ikzDviTkPCZihaCgfwo8AuzSJtovmijOXuLwxKtGKgxnoK/TUK28Ezke2gSYzzQArjgQtsTmEg3YwxUUY0FkCg==", "success": true, - "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file 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 1fdeb046..2ffa7b25 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 = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ +build_property.ProjectDir = D:\Project\gitea\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 5decb385..34f11e1e 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 = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ diff --git a/Admin.Core.IRepository/IRepository_New/ISysUserInfoRepository.cs b/Admin.Core.IRepository/IRepository_New/ISysUserInfoRepository.cs index c0cbf020..1347b862 100644 --- a/Admin.Core.IRepository/IRepository_New/ISysUserInfoRepository.cs +++ b/Admin.Core.IRepository/IRepository_New/ISysUserInfoRepository.cs @@ -40,5 +40,14 @@ namespace Admin.Core.IRepository /// /// Task> GetSheetMetaHourData(string productLineCode); + /// + /// 当前订单执行第一次数据采集时候更新SAP计划 + /// + int UpdateSapPlan(string sapCode); + /// + /// 获取夹具状态 + /// + /// + Task> StatisticalModelStatus(); } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/ISysUserInfoServices.cs b/Admin.Core.IService/IService_New/ISysUserInfoServices.cs index 13e7b320..b0e0a0cb 100644 --- a/Admin.Core.IService/IService_New/ISysUserInfoServices.cs +++ b/Admin.Core.IService/IService_New/ISysUserInfoServices.cs @@ -1,5 +1,6 @@ using Admin.Core.IService; using Admin.Core.Model; +using Admin.Core.Model.Model_New; using Admin.Core.Model.ViewModels; using System; using System.Collections.Generic; @@ -50,5 +51,16 @@ namespace Admin.Core.IService /// Task> GetSheetMetaHourData(string productLineCode); + /// + /// 钣金第一次执行更新日历表 + /// + /// + /// + int UpdateSapPlan(string sapCode); + /// + /// 夹具状态 + /// + /// + Task> StatisticalModelStatus(); } } \ No newline at end of file diff --git a/Admin.Core.Model/Model_New/ModeStatusView.cs b/Admin.Core.Model/Model_New/ModeStatusView.cs new file mode 100644 index 00000000..73f980d0 --- /dev/null +++ b/Admin.Core.Model/Model_New/ModeStatusView.cs @@ -0,0 +1,23 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model +{ + public class ModeStatusView + { + /// + /// 夹具型号 + /// + [SugarColumn(ColumnName = "X_VALUE")] + public string XValue { get; set; } + /// + /// y + /// + [SugarColumn(ColumnName = "Y_VALUE")] + public string YValue { get; set; } + } +} 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 abc27d01..ce84cb9f 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 = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ diff --git a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs index e0e0ef9c..9d7acb7c 100644 --- a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs @@ -89,37 +89,35 @@ namespace Admin.Core.Repository /// public List QuerySheetMetalPlanData(string stationCode) { - string sql = $@"SELECT - P.OBJ_ID, - P.PLAN_CODE, - P.ORDER_CODE, - o.MATERIAL_CODE, - o.MATERIAL_NAME, - m.MATERIAL_SPECIFICATIONS, - P.PRODUCTLINE_CODE, - P.PLAN_AMOUNT, - P.COMPLETE_AMOUNT, - P.BEGIN_TIME, - P.END_TIME - FROM C##AUCMA_MES.PRODUCT_PLANINFO p INNER JOIN - C##AUCMA_MES.BASE_ORDERINFO o ON o.ORDER_CODE = p.ORDER_CODE - INNER JOIN C##AUCMA_MES.BASE_MATERIALINFO m ON o.MATERIAL_CODE = m.MATERIAL_CODE - WHERE - p.ORDER_CODE IN ( SELECT ORDER_CODE FROM C##AUCMA_MES.PRODUCT_PLANINFO p WHERE p.PRODUCTLINE_CODE = '{stationCode}' ) - group by P.OBJ_ID, - P.PLAN_CODE, - P.ORDER_CODE, - o.MATERIAL_CODE, - o.MATERIAL_NAME, - m.MATERIAL_SPECIFICATIONS, - P.PRODUCTLINE_CODE, - P.PLAN_AMOUNT, - P.COMPLETE_AMOUNT, - P.BEGIN_TIME, - P.END_TIME - order by OBJ_ID"; + string sql = $@"select o.OBJ_ID, + P.PLAN_CODE, + P.ORDER_CODE, + o.MATERIAL_CODE, + o.MATERIAL_NAME, + m.MATERIAL_SPECIFICATIONS, + P.PRODUCTLINE_CODE, + P.PLAN_AMOUNT, + P.COMPLETE_AMOUNT, + P.BEGIN_TIME, + P.END_TIME + FROM C##AUCMA_MES.PRODUCT_PLANINFO p INNER JOIN + C##AUCMA_MES.BASE_ORDERINFO o ON o.ORDER_CODE = p.ORDER_CODE + INNER JOIN C##AUCMA_MES.BASE_MATERIALINFO m ON o.MATERIAL_CODE = m.MATERIAL_CODE + INNER JOIN C##AUCMA_MES.BASE_MATERIALINFO m ON o.MATERIAL_CODE = m.MATERIAL_CODE where p.PRODUCTLINE_CODE='{stationCode}' + group by o.OBJ_ID, + P.PLAN_CODE, + P.ORDER_CODE, + o.MATERIAL_CODE, + o.MATERIAL_NAME, + m.MATERIAL_SPECIFICATIONS, + P.PRODUCTLINE_CODE, + P.PLAN_AMOUNT, + P.COMPLETE_AMOUNT, + P.BEGIN_TIME, + P.END_TIME + order by o.OBJ_ID"; - return Db.CopyNew().SqlQueryable(sql).Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToList(); + return Db.CopyNew().SqlQueryable(sql).ToList(); } /// /// 获取钣金下发的计划 diff --git a/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs b/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs index 873c6483..d378220b 100644 --- a/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System; using Microsoft.IdentityModel.Logging; using System.Linq; +using SqlSugar; namespace Admin.Core.Repository { @@ -104,13 +105,33 @@ namespace Admin.Core.Repository #endregion + #region 当前订单执行第一次数据采集时候更新SAP计划 /// - /// /更新计划表数据 + /// 当前订单执行第一次数据采集时候更新SAP计划 /// - //public void UpdateSAPPlan(string PlanCode) - //{ - // string sql = "UPDATE PRODUCT_CALENDAR_INFO SET IS_SCHEDULING = 0 WHERE SAP_PLAN_CODE = '11227552'"; - // return await Db.CopyNew().Ado.ExecuteCommandAsync(sql); - //} + public int UpdateSapPlan(string sapCode) + { + var parameters = new SugarParameter[] + { + new SugarParameter("@SAP_PLAN_CODE", sapCode) + }; + + string sql = "UPDATE PRODUCT_CALENDAR_INFO SET IS_SCHEDULING = 0 WHERE SAP_PLAN_CODE = @SAP_PLAN_CODE"; + int affectedRows = Db.CopyNew().Ado.ExecuteCommand(sql, parameters); + return affectedRows; + } + #endregion + + + #region 统计夹具型号状态 + /// + /// 统计夹具型号状态 + /// + public async Task> StatisticalModelStatus() + { + string sql = "select * from table (scada_xk_fp_01('') )"; + return await Db.CopyNew().Ado.SqlQueryAsync(sql); + } + #endregion } } \ No newline at end of file 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 67886d71..41538400 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 = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ diff --git a/Admin.Core.Service/Service_New/SysUserInfoServices.cs b/Admin.Core.Service/Service_New/SysUserInfoServices.cs index acd2cce9..b217a022 100644 --- a/Admin.Core.Service/Service_New/SysUserInfoServices.cs +++ b/Admin.Core.Service/Service_New/SysUserInfoServices.cs @@ -2,6 +2,7 @@ using Admin.Core.IRepository; using Admin.Core.IService; using Admin.Core.Model; +using Admin.Core.Model.Model_New; using Admin.Core.Model.ViewModels; using Admin.Core.Service; using log4net; @@ -9,6 +10,7 @@ using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Linq; +using System.Reflection.Emit; using System.Threading.Tasks; namespace Admin.Core.IService @@ -83,5 +85,19 @@ namespace Admin.Core.IService { return await _sysUserInfoRepository.GetSheetMetaHourData(productLineCode); } + + + public int UpdateSapPlan(string sapCode) + { + return _sysUserInfoRepository.UpdateSapPlan(sapCode); + } + /// + /// 获取夹具状态 + /// + /// + public Task> StatisticalModelStatus() + { + return _sysUserInfoRepository.StatisticalModelStatus(); + } } } \ No newline at end of file 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 9c6bffa2..19486c3e 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 = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ +build_property.ProjectDir = D:\Project\gitea\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 48679c0e..d114eba8 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 = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ diff --git a/Aucma.Core.SheetMetal/Business/SheetMetalPlanTaskHandle.cs b/Aucma.Core.SheetMetal/Business/SheetMetalPlanTaskHandle.cs index b678f928..156b7c34 100644 --- a/Aucma.Core.SheetMetal/Business/SheetMetalPlanTaskHandle.cs +++ b/Aucma.Core.SheetMetal/Business/SheetMetalPlanTaskHandle.cs @@ -10,10 +10,13 @@ using System.Windows.Documents; using Admin.Core.Common; using Admin.Core.IService; using Admin.Core.Model; +using Admin.Core.Model.Model_New; using Admin.Core.Model.ViewModels; using Admin.Core.Service; using Aucma.Core.HwPLc; using Microsoft.Extensions.DependencyInjection; +using NetTaste; +using NPOI.SS.Formula.Functions; using SqlSugar; namespace Aucma.Core.SheetMetal.Business; @@ -61,7 +64,7 @@ public class SheetMetalPlanTaskHandle /// /// 刷新当前正在执行的计划 /// - public delegate void RefreshExecInfo(string message); + public delegate void RefreshExecInfo(string message,string color); public static event RefreshExecInfo RefreshExecInfoEvent; #endregion @@ -70,15 +73,19 @@ public class SheetMetalPlanTaskHandle protected readonly IRecordSidePanelComplateServices _sidePanelComplateServices; protected readonly IRecordBackPanelComplateServices _backPanelComplateServices; protected readonly IProductPlanInfoServices? _productPlanInfoServices; + protected readonly ISysUserInfoServices? _sysUserInfoServices; + protected readonly IMaterialCompletionServices? _materialCompletionServices; public HwPLc.PlcModel plc1 = null; public SheetMetalPlanTaskHandle() { - _executePlanInfoServices = - App.ServiceProvider.GetService(); + _executePlanInfoServices =App.ServiceProvider.GetService(); _sidePanelComplateServices = App.ServiceProvider.GetService(); _backPanelComplateServices = App.ServiceProvider.GetService(); _productPlanInfoServices = App.ServiceProvider.GetService(); + _backPanelComplateServices = App.ServiceProvider.GetService(); + _sysUserInfoServices = App.ServiceProvider.GetService(); + _materialCompletionServices = App.ServiceProvider.GetService(); } @@ -109,6 +116,8 @@ public class SheetMetalPlanTaskHandle if (planInfo == null) continue; if (planInfo.PlanType == 3 || planInfo.PlanType == 1)//如果为3或者为1 后板计划单独下发 以前板完成为主 { + //获取设置的型号查询对应的型号，下发计划 + SendPlanTaskToBackPanel(planInfo, obj_backPanel); UpdateBackPanelPlanTaskByComplate(planInfo); @@ -183,7 +192,7 @@ public class SheetMetalPlanTaskHandle obj_sidePanel.plc.WriteInt32("D6021", 1); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>计划【{planInfo.TaskCode}】已下发，等待前板设备应答。。。。。。"); - RefreshExecInfoEvent?.Invoke($"计划【{planInfo.TaskCode}】已下发，等待前板设备应答。。。。。。"); + RefreshExecInfoEvent?.Invoke($"计划【{planInfo.TaskCode}】已下发，等待前板设备应答。。。。。。","White"); #region PLC反馈信号逻辑处理 //循环读取PLC应答信号，PLC应答后复位应答信号、更新计划状态为执行中 bool isFlag = true; @@ -195,7 +204,7 @@ public class SheetMetalPlanTaskHandle { obj_sidePanel.plc.WriteInt32("D6021", 0); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>计划【{planInfo.TaskCode}】，收到前板设备应答信号，复位应答地址"); - RefreshExecInfoEvent?.Invoke($"计划【{planInfo.TaskCode}】,收到前板板设备应答信号，复位应答地址"); + RefreshExecInfoEvent?.Invoke($"计划【{planInfo.TaskCode}】,收到前板板设备应答信号，复位应答地址", "White"); startTime=DateTime.Now; isFlag = false; } @@ -255,7 +264,7 @@ public class SheetMetalPlanTaskHandle obj_backPanel.plc.WriteInt32("D4021", 1); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>计划【{planInfo.TaskCode}】已下发，等待背板设备应答。。。。。。"); - RefreshExecInfoEvent?.Invoke($"计划【{planInfo.TaskCode}】以下发，等待背板设备应答。。。。。。"); + RefreshExecInfoEvent?.Invoke($"计划【{planInfo.TaskCode}】已下发，等待背板设备应答。。。。。。", "White"); #region PLC反馈信号逻辑处理 //循环读取PLC应答信号，PLC应答后复位应答信号、更新计划状态为执行中 bool isFlag = true; @@ -267,7 +276,7 @@ public class SheetMetalPlanTaskHandle { obj_backPanel.plc.WriteInt32("D4021", 0); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>收到背板板设备应答信号，复位应答地址"); - RefreshExecInfoEvent?.Invoke($"收到背板板设备应答信号，复位应答地址"); + RefreshExecInfoEvent?.Invoke($"收到背板板设备应答信号，复位应答地址", "White"); startTime = DateTime.Now; isFlag = false; } @@ -328,7 +337,7 @@ public class SheetMetalPlanTaskHandle int sumBackPanelAmount = backPanelComplates.Sum(x => x.OutPutAmount); Console.WriteLine($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount};背板完成：{sumBackPanelAmount}"); - RefreshExecInfoEvent?.Invoke($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount};背板完成：{sumBackPanelAmount}"); + RefreshExecInfoEvent?.Invoke($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount};背板完成：{sumBackPanelAmount}", "White"); int sumAmount = 0; if (planInfo.PlanType == 1) @@ -339,7 +348,6 @@ public class SheetMetalPlanTaskHandle { sumAmount = sumSidePanelAmount; planInfo.ExecuteStatus = 3; - } if (sumSidePanelAmount < sumBackPanelAmount && sumBackPanelAmount == planInfo.PlanAmount) { @@ -420,7 +428,7 @@ public class SheetMetalPlanTaskHandle catch (Exception ex) { Console.WriteLine($"计划任务信息更新异常：{ex.Message}"); - RefreshExecInfoEvent?.Invoke($"计划任务信息更新异常：{ex.Message}"); + RefreshExecInfoEvent?.Invoke($"计划任务信息更新异常：{ex.Message}", "Red"); } } /// @@ -446,7 +454,7 @@ public class SheetMetalPlanTaskHandle int sumBackPanelAmount = backPanelComplates.Sum(x => x.OutPutAmount); Console.WriteLine($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount}；背板完成：{sumBackPanelAmount}"); - RefreshExecInfoEvent?.Invoke($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount}；背板完成：{sumBackPanelAmount}"); + RefreshExecInfoEvent?.Invoke($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount}；背板完成：{sumBackPanelAmount}", "White"); int sumAmount = 0; @@ -516,7 +524,7 @@ public class SheetMetalPlanTaskHandle catch (Exception ex) { Console.WriteLine($"计划任务信息更新异常：{ex.Message}"); - RefreshExecInfoEvent?.Invoke($"计划任务信息更新异常：{ex.Message}"); + RefreshExecInfoEvent?.Invoke($"计划任务信息更新异常：{ex.Message}", "Red"); } } while (isComplate); @@ -534,74 +542,6 @@ public class SheetMetalPlanTaskHandle #endregion - - - - #region 更新计划列表数量 - /// - /// 更新计划列表数量 - /// - public void UpdateComplatePlan() - { - string stationCode = Appsettings.app("StationInfo", "StationCode"); - while (true) - { - - var planInfoList = _executePlanInfoServices.QueryAsync(d=>d.ProductLineCode.Contains(stationCode)).Result; - if (planInfoList == null || planInfoList.Count == 0) continue; - - var list = from d in planInfoList - select new - { - d.OrderCode, - d.CompleteAmount - }; - - var grouplist =( from d in list - group d by d.OrderCode into g - select new - { - OrderCode = g.Key, - CompleteAmount = g.Sum(d=>d.CompleteAmount) - }).OrderBy(t => t.OrderCode).ToList(); - - var productPlanInfoList= _productPlanInfoServices.QueryAsync(d => d.ProductLineCode.Contains(stationCode)&& d.CompleteAmount!=d.PlanAmount).Result; - productPlanInfoList.ForEach(t => - { - var obj= grouplist.SingleOrDefault(d=>d.OrderCode.Equals(t.OrderCode)); - if (obj != null) - { - if (t.PlanAmount == obj.CompleteAmount) - { - t.CompleteAmount = obj.CompleteAmount; - t.EndTime = DateTime.Now; - } - if (t.PlanAmount > obj.CompleteAmount) - { - t.CompleteAmount = obj.CompleteAmount; - } - else - { - t.CompleteAmount = t.PlanAmount; - } - if (obj.CompleteAmount!=0) - { - _productPlanInfoServices.UpdateAsync(t); - } - } - }); - - Thread.Sleep(5000); - } - - } - - #endregion - - - - - #region 下发单个计划逻辑 @@ -678,7 +618,7 @@ public class SheetMetalPlanTaskHandle int sumBackPanelAmount = backPanelComplates.Sum(x => x.OutPutAmount); Console.WriteLine($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount}；背板完成：{sumBackPanelAmount}"); - RefreshExecInfoEvent?.Invoke($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount}；背板完成：{sumBackPanelAmount}"); + RefreshExecInfoEvent?.Invoke($"当前计划：{planInfo.TaskCode};计划产量：{planInfo.PlanAmount}；前板完成：{sumSidePanelAmount}；背板完成：{sumBackPanelAmount}", "White"); int sumAmount = 0; if (planInfo.PlanType == 1) @@ -724,7 +664,7 @@ public class SheetMetalPlanTaskHandle catch (Exception ex) { Console.WriteLine($"计划任务信息更新异常：{ex.Message}"); - RefreshExecInfoEvent?.Invoke($"计划任务信息更新异常：{ex.Message}"); + RefreshExecInfoEvent?.Invoke($"计划任务信息更新异常：{ex.Message}", "Red"); } } @@ -751,7 +691,7 @@ public class SheetMetalPlanTaskHandle obj_sidePanel.plc.WriteInt32("D6021", 1); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>等待前板设备应答。。。。。。"); - RefreshExecInfoEvent?.Invoke("等待前板设备应答......"); + RefreshExecInfoEvent?.Invoke("等待前板设备应答......","Red"); //下发完成后读取PLC应答，应答后复位应答信号 #region PLC反馈信号逻辑处理 @@ -764,7 +704,7 @@ public class SheetMetalPlanTaskHandle { obj_sidePanel.plc.WriteInt32("D6021", 0); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>收到前板设备应答信号，复位应答地址"); - RefreshExecInfoEvent?.Invoke("收到前板设备应答信号，复位应答地址"); + RefreshExecInfoEvent?.Invoke("收到前板设备应答信号，复位应答地址","White"); isFlag = false; } Thread.Sleep(2000); @@ -803,7 +743,7 @@ public class SheetMetalPlanTaskHandle obj_backPanel.plc.WriteInt32("D4021", 1); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>等待背板设备应答。。。。。。"); - RefreshExecInfoEvent?.Invoke($"等待背板设备应答。。。。。。"); + RefreshExecInfoEvent?.Invoke($"等待背板设备应答。。。。。。", "White"); #region PLC反馈信号逻辑处理 //循环读取PLC应答信号，PLC应答后复位应答信号、更新计划状态为执行中 bool isFlag = true; @@ -813,7 +753,7 @@ public class SheetMetalPlanTaskHandle { obj_backPanel.plc.WriteInt32("D4021", 0); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>收到背板板设备应答信号，复位应答地址"); - RefreshExecInfoEvent?.Invoke("收到背板板设备应答信号，复位应答地址"); + RefreshExecInfoEvent?.Invoke("收到背板板设备应答信号，复位应答地址", "White"); isFlag = false; } Thread.Sleep(2000); @@ -870,7 +810,7 @@ public class SheetMetalPlanTaskHandle obj_sidePanel.plc.WriteInt32("D6021", 1); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>等待前板设备应答。。。。。。"); - RefreshExecInfoEvent?.Invoke("等待前板设备应答......"); + RefreshExecInfoEvent?.Invoke("等待前板设备应答......", "White"); //下发完成后读取PLC应答，应答后复位应答信号 #region PLC反馈信号逻辑处理 @@ -882,7 +822,7 @@ public class SheetMetalPlanTaskHandle { obj_sidePanel.plc.WriteInt32("D6021", 0); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>收到前板设备应答信号，复位应答地址"); - RefreshExecInfoEvent?.Invoke("收到前板设备应答信号......"); + RefreshExecInfoEvent?.Invoke("收到前板设备应答信号......", "White"); isFlag = false; } Thread.Sleep(2000); @@ -955,7 +895,7 @@ public class SheetMetalPlanTaskHandle int productionBeat = short.Parse(bytesToHexStr(info.Skip(51).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); Console.WriteLine($"前板设备数据读取====>>>>当前计划：{planCode},物料编号：{materialCode},完成数量：{complateAmount},下线数量：{offLineAmount},设备状态：{deviceStatus},生产节拍：{productionBeat}"); - RefreshExecInfoEvent?.Invoke($"前板设备数据读取====>>>>当前计划：{planCode},物料编号：{materialCode},完成数量：{complateAmount},下线数量：{offLineAmount},设备状态：{deviceStatus},生产节拍：{productionBeat}"); + RefreshExecInfoEvent?.Invoke($"前板设备数据读取====>>>>当前计划：{planCode},物料编号：{materialCode},完成数量：{complateAmount},下线数量：{offLineAmount},设备状态：{deviceStatus},生产节拍：{productionBeat}", "White"); //添加完工记录 RecordSidePanelComplate sidePanelComplate = new RecordSidePanelComplate() @@ -1011,7 +951,7 @@ public class SheetMetalPlanTaskHandle { isFlag = false; Console.WriteLine($"前板计划执行完成，计划数量：{planInfo.PlanAmount}；实际产量：{sumComplateAmount}；差异值：{planInfo.PlanAmount - sumComplateAmount}"); - RefreshExecInfoEvent?.Invoke($"前板计划执行完成，计划数量：{planInfo.PlanAmount}；实际产量：{sumComplateAmount}；差异值：{planInfo.PlanAmount - sumComplateAmount}"); + RefreshExecInfoEvent?.Invoke($"前板计划执行完成，计划数量：{planInfo.PlanAmount}；实际产量：{sumComplateAmount}；差异值：{planInfo.PlanAmount - sumComplateAmount}", "White"); } } } @@ -1041,7 +981,7 @@ public class SheetMetalPlanTaskHandle catch (Exception e) { Console.WriteLine($"读取前板设备完成数据异常:{e.Message}"); - RefreshExecInfoEvent?.Invoke($"读取前板设备完成数据异常:{e.Message}"); + RefreshExecInfoEvent?.Invoke($"读取前板设备完成数据异常:{e.Message}", "Red"); } } while (isFlag); @@ -1078,7 +1018,7 @@ public class SheetMetalPlanTaskHandle obj_backPanel.plc.WriteInt32("D4021", 1); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>等待背板设备应答。。。。。。"); - RefreshExecInfoEvent?.Invoke($"等待背板设备应答。。。。。。"); + RefreshExecInfoEvent?.Invoke($"等待背板设备应答。。。。。。", "White"); #region PLC反馈信号逻辑处理 //循环读取PLC应答信号，PLC应答后复位应答信号、更新计划状态为执行中 bool isFlag = true; @@ -1089,7 +1029,7 @@ public class SheetMetalPlanTaskHandle { obj_backPanel.plc.WriteInt32("D4021", 0); Console.WriteLine($"{DateTime.Now.ToString("HH:m:s")}===>收到背板板设备应答信号，复位应答地址"); - RefreshExecInfoEvent?.Invoke($"收到背板板设备应答信号，复位应答地址"); + RefreshExecInfoEvent?.Invoke($"收到背板板设备应答信号，复位应答地址", "White"); isFlag = false; } Thread.Sleep(2000); @@ -1161,7 +1101,7 @@ public class SheetMetalPlanTaskHandle int productionBeat = short.Parse(bytesToHexStr(info.Skip(51).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber); Console.WriteLine($"背板设备数据读取====>>>>当前计划：{planCode},物料编号：{materialCode},完成数量：{complateAmount},下线数量：{offLineAmount},设备状态：{deviceStatus},生产节拍：{productionBeat}"); - RefreshExecInfoEvent?.Invoke($"当前计划：{planCode},物料编号：{materialCode},完成数量：{complateAmount},下线数量：{offLineAmount},设备状态：{deviceStatus},生产节拍：{productionBeat}"); + RefreshExecInfoEvent?.Invoke($"当前计划：{planCode},物料编号：{materialCode},完成数量：{complateAmount},下线数量：{offLineAmount},设备状态：{deviceStatus},生产节拍：{productionBeat}", "White"); //添加完工记录 RecordBackPanelComplate backPanelComplate = new RecordBackPanelComplate() { @@ -1215,7 +1155,7 @@ public class SheetMetalPlanTaskHandle { isFlag = false; Console.WriteLine($"背板计划执行完成，计划数量：{planInfo.PlanAmount}；实际产量：{sumComplateAmount}；差异值：{planInfo.PlanAmount - sumComplateAmount}"); - RefreshExecInfoEvent?.Invoke($"背板计划执行完成，计划数量：{planInfo.PlanAmount}；实际产量：{sumComplateAmount}；差异值：{planInfo.PlanAmount - sumComplateAmount}"); + RefreshExecInfoEvent?.Invoke($"背板计划执行完成，计划数量：{planInfo.PlanAmount}；实际产量：{sumComplateAmount}；差异值：{planInfo.PlanAmount - sumComplateAmount}", "White"); } } } @@ -1244,7 +1184,7 @@ public class SheetMetalPlanTaskHandle catch (Exception e) { Console.WriteLine($"读取背板设备完成数据异常:{e.Message}"); - RefreshExecInfoEvent?.Invoke($"背板⽣产计划下发异常：{e.Message}"); + RefreshExecInfoEvent?.Invoke($"背板⽣产计划下发异常：{e.Message}", "Red"); } } @@ -1271,9 +1211,92 @@ public class SheetMetalPlanTaskHandle } } return returnStr; - } + } #endregion + #region 更新计划列表数量 + /// + /// 更新计划列表数量 + /// + public void UpdateComplatePlan() + { + string stationCode = Appsettings.app("StationInfo", "StationCode"); + string productLineCode = Appsettings.app("StationInfo", "ProductLineCode"); + List pPlanInfoList = new List(); + while (true) + { + + var planInfoList = _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Contains(stationCode)).Result; + if (planInfoList == null || planInfoList.Count == 0) continue; + + var list = from d in planInfoList + select new + { + d.OrderCode, + d.CompleteAmount + }; + + var grouplist = (from d in list + group d by d.OrderCode into g + select new + { + OrderCode = g.Key, + CompleteAmount = g.Sum(d => d.CompleteAmount) + }).OrderBy(t => t.OrderCode).ToList(); + var productPlanInfoList = _productPlanInfoServices.QueryAsync(d => d.ProductLineCode.Contains(stationCode) && d.CompleteAmount != d.PlanAmount).Result; + + + productPlanInfoList.ForEach(async t => + { + var materialCompletionList = _materialCompletionServices.QueryAsync(d => d.ProductLineCode.Contains(productLineCode) && d.StationName.Equals(stationCode)).Result; + var obj = grouplist.FirstOrDefault(d => d.OrderCode.Equals(t.OrderCode)); + + if (obj != null) + { + ProductPlanInfo productPlanInfo = new ProductPlanInfo(); + + if (obj.CompleteAmount == 1 && t.CompleteAmount == 0) + { + productPlanInfo.EndTime = DateTime.Now; + _sysUserInfoServices.UpdateSapPlan(obj.OrderCode);//第一次执行更新日历表 + } + if (t.PlanAmount == obj.CompleteAmount) + { + productPlanInfo.CompleteAmount = obj.CompleteAmount; + productPlanInfo.EndTime = DateTime.Now; + } + if (t.PlanAmount > obj.CompleteAmount) + { + productPlanInfo.CompleteAmount = obj.CompleteAmount; + } + else + { + productPlanInfo.CompleteAmount = t.PlanAmount; + } + int completeNum = materialCompletionList.Count();//过点完成数量 + if ((obj.CompleteAmount - completeNum) > 0) + { + MaterialCompletion materialCompletion = new MaterialCompletion(); + materialCompletion.OrderCode = t.OrderCode; + materialCompletion.ProductLineCode = productLineCode; + materialCompletion.MaterialCode = t.MaterialCode; + materialCompletion.MaterialName = t.MaterialName; + materialCompletion.StationName = stationCode; + materialCompletion.CompleteDate = DateTime.Now; + materialCompletion.planCode = t.PlanCode; + await _materialCompletionServices.AddAsync(materialCompletion); + } + } + }); + if (pPlanInfoList.Count != 0 && pPlanInfoList != null) + { + _productPlanInfoServices.UpdateAsync(pPlanInfoList); + } + Thread.Sleep(3000); + } + } + + #endregion } \ No newline at end of file diff --git a/Aucma.Core.SheetMetal/Models/ListBoxDataView.cs b/Aucma.Core.SheetMetal/Models/ListBoxDataView.cs new file mode 100644 index 00000000..9ca32a41 --- /dev/null +++ b/Aucma.Core.SheetMetal/Models/ListBoxDataView.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.SheetMetal.Models +{ + public class ListBoxDataView + { + /// + /// 颜色 + /// + public string Color { get; set; } + /// + /// 内容 + /// + public string Content { get; set; } + } +} diff --git a/Aucma.Core.SheetMetal/Models/SelectColorView.cs b/Aucma.Core.SheetMetal/Models/SelectColorView.cs new file mode 100644 index 00000000..f864f694 --- /dev/null +++ b/Aucma.Core.SheetMetal/Models/SelectColorView.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.SheetMetal.Models +{ + public enum SelectColorView + { + Red, + White + } +} diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs index 41623c41..20cb2b7c 100644 --- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs @@ -19,13 +19,11 @@ using Admin.Core.Common; using LiveCharts.Defaults; using Aucma.Core.SheetMetal.Business; using Admin.Core.Model.ViewModels; -using NPOI.SS.Formula.Functions; using log4net; using Aucma.Core.HwPLc; -using static Npgsql.Replication.PgOutput.Messages.RelationMessage; using System.Text; using System.Threading; -using Admin.Core.Service; +using Admin.Core.Model.Model_New; /* * 首页信息 */ @@ -33,7 +31,10 @@ namespace Aucma.Core.SheetMetal.ViewModels { public partial class IndexPageViewModel : ObservableObject { - private static readonly log4net.ILog log = LogManager.GetLogger(typeof(LogPageViewModel)); + private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel)); + + #region 初始化接口 + protected readonly IExecutePlanInfoServices? _taskExecutionPlanInfoServices; protected readonly IRecordBackPanelComplateServices _recordBackPanelComplateServices; protected readonly IRecordSidePanelComplateServices _recordSidePanelComplateServices; @@ -41,8 +42,12 @@ namespace Aucma.Core.SheetMetal.ViewModels protected readonly IBaseBomInfoServices _baseBomInfoServices; private readonly ISysUserInfoServices _sysUserInfoServices; private readonly IRecordInStoreServices _recordInstoreServices; - private AppConfigHelper appConfig = new AppConfigHelper(); - List list = new List() { new SelectModel() + private readonly IBaseOrderInfoServices _baseOrderInfoServices; + #endregion + + #region 初始化下拉数据 + private AppConfigHelper appConfig = new AppConfigHelper();//读取保存的文本数据 + List selectList = new List() { new SelectModel() { ID=1, TypeName="手动" @@ -52,13 +57,18 @@ namespace Aucma.Core.SheetMetal.ViewModels ID=2, TypeName="自动" }}; + #endregion + + #region 定义对象和定义字段 public Func Formatter { get; set; } - public HwPLc.PlcModel obj = null; + public HwPLc.PlcModel obj = null; + #endregion #region 构造函数 public IndexPageViewModel() { _stationName = Appsettings.app("StationInfo", "StationName");//工位名称 + _baseOrderInfoServices = App.ServiceProvider.GetService(); _executePlanInfoServices = App.ServiceProvider.GetService(); _taskExecutionPlanInfoServices = App.ServiceProvider.GetService(); _recordBackPanelComplateServices = App.ServiceProvider.GetService(); @@ -78,17 +88,19 @@ namespace Aucma.Core.SheetMetal.ViewModels } #endregion + #region 更新前端数据 public Task RefreshChat() { RefreshHourAmountChart();//小时产量 RefreshMaterialChart();//型号产量 return Task.CompletedTask; - } + } + #endregion #region 下拉 public void AddSelectData() { - foreach (var item in list) + foreach (var item in selectList) { LocationSource.Add(item); } @@ -268,22 +280,22 @@ namespace Aucma.Core.SheetMetal.ViewModels #endregion #region 刷新计划执行 - public void RefreshPlanShow(SheetMetaSendPlanInfoView execPlan) + public async void RefreshPlanShow(SheetMetaSendPlanInfoView execPlan) { //更新首页显示信息 - //ExecutePlanInfo execPlan = execList.SingleOrDefault(d => d.ExecuteStatus == 2); - if (execPlan != null) + BaseOrderInfo orderPlan =await _baseOrderInfoServices.FirstAsync(d => d.OrderCode == execPlan.OrderCode); + if (orderPlan != null) { OrderCode = execPlan.OrderCode; MesMOrderCode = execPlan.ProductPlanCode; ProductModel = execPlan.MaterialName; BeginTime = string.IsNullOrEmpty(execPlan.BeginTime)?"": execPlan.BeginTime.ToString(); - PlanMaxNum = PlanNum = execPlan.PlanAmount;//显示SAP订单数，而不是拆分订单计划数 - RealQuantity = execPlan.CompleteAmount; - double diff = _planMaxNum - _realQuantity; + PlanMaxNum = orderPlan.OrderAmount;//显示SAP订单数，而不是拆分订单计划数 + RealQuantity = orderPlan.CompleteAmount; + double diff = orderPlan.OrderAmount - RealQuantity; DiffQuantity = int.Parse(diff.ToString()); //CompletionRate = (_realQuantity/_planMaxNum).ToString("0%"); - CompletionRate = (_realQuantity / _planMaxNum); + CompletionRate = double.Parse((RealQuantity / orderPlan.OrderAmount).ToString()); } else { @@ -778,7 +790,7 @@ namespace Aucma.Core.SheetMetal.ViewModels { //读取入到配置文件中 var queryExec = appConfig.queryExec; - var model = list.FirstOrDefault(d => d.ID == int.Parse(queryExec)); + var model = selectList.FirstOrDefault(d => d.ID == int.Parse(queryExec)); return model; } #endregion @@ -830,6 +842,7 @@ namespace Aucma.Core.SheetMetal.ViewModels var column = new ColumnSeries(); column.DataLabels = true; column.Title = "前板"; + column.ScalesYAt = 0; column.Values = hourAchievement1; column.Foreground = Brushes.White; column.FontSize = 18; @@ -840,7 +853,8 @@ namespace Aucma.Core.SheetMetal.ViewModels { DataLabels = true, Title = "后板", - Values = hourAchievement2, + ScalesYAt = 0, + Values = hourAchievement2, Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)), Foreground = Brushes.CadetBlue, FontSize = 18 @@ -852,7 +866,6 @@ namespace Aucma.Core.SheetMetal.ViewModels } #endregion - #region 更新小时产量统计 /// /// 更新小时产量统计 @@ -882,7 +895,6 @@ namespace Aucma.Core.SheetMetal.ViewModels } #endregion - #region 刷新物料型号统计 /// /// 刷新物料型号统计 @@ -914,6 +926,7 @@ namespace Aucma.Core.SheetMetal.ViewModels var column2 = new ColumnSeries(); column2.DataLabels = true; column2.Title = "前板"; + column2.ScalesYAt = 0; column2.Values = achievement1; column2.Foreground = Brushes.White; column2.FontSize = 18; @@ -924,7 +937,8 @@ namespace Aucma.Core.SheetMetal.ViewModels DataLabels = true, Title = "后板", Values = achievement2, - Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)), + ScalesYAt = 0, + Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)), Foreground = Brushes.White, FontSize = 18 }); @@ -935,7 +949,6 @@ namespace Aucma.Core.SheetMetal.ViewModels } #endregion - #region 刷新物料型号统计 /// /// 刷新物料型号统计 @@ -993,63 +1006,86 @@ namespace Aucma.Core.SheetMetal.ViewModels public CurrentTeamTimeView GetTeamHour() { - List obj = _sysUserInfoServices.GetTeamData().Result; - if (obj != null) + try + { + List obj = _sysUserInfoServices.GetTeamData().Result; + if (obj != null) + { + CurrentTeamTimeView view = new CurrentTeamTimeView(); + view.TeamName = obj.FirstOrDefault(d => d.Seq == 1).TeamName; + view.StartTime = obj.Min(d => d.StartTime); + view.EndTime = obj.Max(d => d.EndTime); + return view; + } + } + catch (Exception ex) { - CurrentTeamTimeView view = new CurrentTeamTimeView(); - view.TeamName = obj.FirstOrDefault(d => d.Seq == 1).TeamName; - view.StartTime = obj.Min(d => d.StartTime); - view.EndTime = obj.Max(d => d.EndTime); - return view; + log.Error($"获取当前班组时间异常:{ex.Message}"); } return null; } #endregion - + #region PLC存储的当前正在执行的前后板计划编号 public string GetSidePlanCode(PlcModel obj) { bool flag = true; string planCode = string.Empty; - do + try { - - byte[] info = obj.plc.Read("D6030", 59); - - if (info == null) + do { - Thread.Sleep(1000); - continue; - } - //计划编号 - planCode = Encoding.ASCII.GetString(info.Skip(0).Take(20).ToArray()).Replace("\0", "").Trim(); - if (!string.IsNullOrEmpty(planCode)) flag = false; - } while (flag); + byte[] info = obj.plc.Read("D6030", 59); + + if (info == null) + { + Thread.Sleep(1000); + continue; + } + + //计划编号 + planCode = Encoding.ASCII.GetString(info.Skip(0).Take(20).ToArray()).Replace("\0", "").Trim(); + if (!string.IsNullOrEmpty(planCode)) flag = false; + } while (flag); + } + catch (Exception ex) + { + log.Error($"获取前板传入的计划编号:{ex.Message}"); + } return planCode; } public string GetBackPlanCode(PlcModel obj) { - bool flag = true; string planCode = string.Empty; - do + try { - - byte[] info = obj.plc.Read("D4030", 59); - - if (info == null) + bool flag = true; + + do { - Thread.Sleep(1000); - continue; - } + byte[] info = obj.plc.Read("D4030", 59); + + if (info == null) + { + Thread.Sleep(1000); + continue; + } - //计划编号 - planCode = Encoding.ASCII.GetString(info.Skip(0).Take(20).ToArray()).Replace("\0", "").Trim(); - if (!string.IsNullOrEmpty(planCode)) flag = false; - } while (flag); + //计划编号 + planCode = Encoding.ASCII.GetString(info.Skip(0).Take(20).ToArray()).Replace("\0", "").Trim(); + if (!string.IsNullOrEmpty(planCode)) flag = false; + } while (flag); + + } + catch (Exception ex) + { + log.Error($"获取后板传入的计划编号:{ex.Message}"); + } return planCode; - } + } + #endregion } } diff --git a/Aucma.Core.SheetMetal/ViewModels/LogPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/LogPageViewModel.cs index bc312a5d..47f0d91f 100644 --- a/Aucma.Core.SheetMetal/ViewModels/LogPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/LogPageViewModel.cs @@ -12,14 +12,14 @@ using System.Threading.Tasks; using System.Windows.Documents; using Admin.Core.Tasks; using Aucma.Core.SheetMetal.Business; +using Aucma.Core.SheetMetal.Models; namespace Aucma.Core.SheetMetal.ViewModels { public class LogPageViewModel : ObservableObject { - private ObservableCollection listItems = new ObservableCollection(); private static readonly log4net.ILog log = LogManager.GetLogger(typeof(LogPageViewModel)); - + private ObservableCollection listItems = new ObservableCollection(); public LogPageViewModel() { SheetMetalPlanTaskHandle.RefreshExecInfoEvent += PrintMessageToListBox; @@ -28,8 +28,8 @@ namespace Aucma.Core.SheetMetal.ViewModels /// /// LisBox数据模板 /// - private IEnumerable logInfoListBox; - public IEnumerable LogInfoListBox + private IEnumerable logInfoListBox; + public IEnumerable LogInfoListBox { get => logInfoListBox; set => SetProperty(ref logInfoListBox, value); @@ -39,14 +39,19 @@ namespace Aucma.Core.SheetMetal.ViewModels /// listBox绑定日志 /// /// - private void PrintMessageToListBox(string message) + /// Red or White + private void PrintMessageToListBox(string message, string color) { try { - listItems.Add($"{DateTime.Now.ToString("HH:mm:ss")}==>{message}"); - - LogInfoListBox = listItems.OrderByDescending(x => x); - + System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => + { + string content = $"{DateTime.Now.ToString("HH:mm:ss")}==>{message}"; + ListBoxDataView view = new ListBoxDataView { Content = content, Color = color }; + //listItems.Add(view); + listItems.Insert(0, view); + LogInfoListBox = listItems; + })); } catch (Exception ex) { @@ -54,5 +59,8 @@ namespace Aucma.Core.SheetMetal.ViewModels } } + + public ObservableCollection Items { get; set; } } + } diff --git a/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs index 64ac7697..2e6b5467 100644 --- a/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/MaterialStatisticsViewModel.cs @@ -4,22 +4,31 @@ using Admin.Core.Model; using Admin.Core.Service; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using LiveCharts; +using LiveCharts.Defaults; +using LiveCharts.Wpf; using Microsoft.Extensions.DependencyInjection; +using Pipelines.Sockets.Unofficial; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Windows; +using System.Windows.Media; namespace Aucma.Core.SheetMetal.ViewModels { public partial class MaterialStatisticsViewModel : ObservableObject { private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; + private readonly ISysUserInfoServices _sysUserInfoServices; public MaterialStatisticsViewModel() { _baseSpaceInfoServices = App.ServiceProvider.GetService(); + _sysUserInfoServices = App.ServiceProvider.GetService(); Refresh(); + } #region 刷新 @@ -79,6 +88,8 @@ namespace Aucma.Core.SheetMetal.ViewModels if (string.IsNullOrEmpty(item.MaterialType)) continue; FoamBeforeMaterialStockDataGrid.Add(new BaseSpaceInfo() { MaterialType = item.MaterialType, SpaceStock = item.SpaceStock }); } + //夹具状态 + RefreshModeStatus(); } #endregion @@ -133,5 +144,77 @@ namespace Aucma.Core.SheetMetal.ViewModels set => SetProperty(ref foamBeforeMaterialStockDataGrid, value); } #endregion + + + #region 刷新夹具统计 + /// + /// 刷新夹具统计 + /// + private void RefreshModeStatus() + { + App.Current.Dispatcher.Invoke((Action)(async () => + { + var modeStatus = await _sysUserInfoServices.StatisticalModelStatus(); + + if (modeStatus != null) + { + if (Achievement.Count != 0) Achievement.Clear(); + + ModeTypeList = new List(); + ChartValues achievement = new ChartValues(); + int hour = 0; + foreach (var item in modeStatus) + { + achievement.Add(Convert.ToInt32(item.YValue)); + ModeTypeList.Add(item.XValue); + hour++; + } + #region 按夹具状态统计 + + Achievement.Add(new ColumnSeries + { + DataLabels = true, + Title = "夹具状态", + ScalesYAt = 0, + Values = achievement, + Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226)), + Foreground = Brushes.CadetBlue, + FontSize = 18 + }); + + #endregion + } + })); + } + #endregion + + + #region 夹具状态统计 + + #region 夹具状态统计 + /// + /// 夹具状态统计 + /// + private List modeTypeList; + + public List ModeTypeList + { + get { return modeTypeList; } + set { modeTypeList = value; } + } + #endregion + + /// + /// 夹具状态统计 + /// + private SeriesCollection achievement = new SeriesCollection(); + + public SeriesCollection Achievement + { + get { return achievement; } + set { achievement = value; } + } + + #endregion } } diff --git a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs index cb88e4a0..cad13104 100644 --- a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs @@ -16,99 +16,105 @@ using Castle.Core.Internal; using CommunityToolkit.Mvvm.Messaging; using Aucma.Core.SheetMetal.Views; using Aucma.Core.SheetMetal.Common; -using System.Windows.Input; using Admin.Core.Common; -using System.Drawing.Drawing2D; -using Aucma.Core.SheetMetal.Business; -using Aucma.Core.HwPLc; -using Admin.Core.Service; namespace Aucma.Core.SheetMetal.ViewModels { public partial class SplitPlanViewModel : ObservableObject { - - private static readonly log4net.ILog log = LogManager.GetLogger(typeof(SplitPlanViewModel)); protected readonly IProductPlanInfoServices? _productPlanInfoServices; protected readonly IExecutePlanInfoServices? _executePlanInfoServices; - private AppConfigHelper appConfig = new AppConfigHelper(); - + private AppConfigHelper appConfig = new AppConfigHelper();//读取配置文件保存的查询内容 + + #region 构造函数 public SplitPlanViewModel() { _productPlanInfoServices = App.ServiceProvider.GetService(); _executePlanInfoServices = App.ServiceProvider.GetService(); Task.WaitAll(LoadData()); //加载快捷方式 - SaveSearchCriteria(); + SaveSearchCriteria(); WeakReferenceMessenger.Default.Register(this, SaveSearchCriteria); _radioButtonStatus = 1; - } + } + #endregion #region 加载DataGrid数据 private async Task LoadData() { - MaterialDataGrid.Clear(); - int i = 1; - string station = Appsettings.app("StationInfo", "StationCode"); - var execList = _executePlanInfoServices.QuerySheetMetalPlanData(station); - if (execList == null) return; - foreach (var item in execList) + try { - int residue = 0; - if (execList == null) residue = 0; - else residue = (execList.Where(d => d.MaterialCode.Equals(item.MaterialCode))).Sum(d => d.PlanAmount); - MaterialDataGrid.Add(new ProductPlanInfoModel() + MaterialDataGrid.Clear(); + int i = 1; + string station = Appsettings.app("StationInfo", "StationCode"); + var execList = _executePlanInfoServices.QuerySheetMetalPlanData(station); + if (execList == null) return; + foreach (var item in execList) { - No = i, - PlanCode = item.PlanCode, - MaterialCode = item.MaterialCode, - MaterialName = item.MaterialName, - OrderCode = item.OrderCode, - PlanAmount = item.PlanAmount, - ResidueAmount = item.PlanAmount - item.CompleteAmount, - SpliteResidueAmount = item.PlanAmount - residue, - MaterialSpecificatons = item.MaterialSpecificatons, - StartDate = item.BeginTime - }); - i++; - } + int residue = 0; + if (execList == null) residue = 0; + else residue = (execList.Where(d => d.MaterialCode.Equals(item.MaterialCode))).Sum(d => d.PlanAmount); + MaterialDataGrid.Add(new ProductPlanInfoModel() + { + No = i, + PlanCode = item.PlanCode, + OrderCode = item.OrderCode, + MaterialCode = item.MaterialCode, + MaterialName = item.MaterialName, + PlanAmount = item.PlanAmount, + ResidueAmount = item.PlanAmount - item.CompleteAmount, + SpliteResidueAmount = item.PlanAmount - residue, + MaterialSpecificatons = item.MaterialSpecificatons, + CompleteAmount = item.CompleteAmount, + StartDate = item.BeginTime + }); + i++; + } - await Task.CompletedTask; + } + catch (Exception ex) + { + log.Error($"初始化查询：{ex.Message}"); + } + await Task.CompletedTask; } private async Task LoadData(string obj) { - string station = Appsettings.app("StationInfo", "StationCode"); - MaterialDataGrid.Clear(); - int i = 1; - //var planlist = _productPlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station)).Result; - //if (planlist == null) return ; - //var execList = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station)); - //if (execList == null) return; - var execList = _executePlanInfoServices.QuerySheetMetalPlanData(station); - if (execList == null) return; - execList=execList.Where(d => d.MaterialName.Contains(obj) || d.OrderCode.Contains(obj) || d.PlanCode.Contains(obj)).ToList(); - foreach (var item in execList) + try { - int residue = 0; - if (execList == null) residue = 0; - else residue = (execList.Where(d => d.MaterialCode.Equals(item.MaterialCode))).Sum(d => d.PlanAmount); - MaterialDataGrid.Add(new ProductPlanInfoModel() + string station = Appsettings.app("StationInfo", "StationCode"); + MaterialDataGrid.Clear(); + int i = 1; + var execList = _executePlanInfoServices.QuerySheetMetalPlanData(station); + if (execList == null) return; + execList = execList.Where(d => d.MaterialName.Contains(obj) || d.OrderCode.Contains(obj) || d.PlanCode.Contains(obj)).ToList(); + foreach (var item in execList) { - No = i, - PlanCode = item.PlanCode, - MaterialCode = item.MaterialCode, - MaterialName = item.MaterialName, - OrderCode = item.OrderCode, - PlanAmount = item.PlanAmount, - ResidueAmount = item.PlanAmount - item.CompleteAmount, - SpliteResidueAmount = item.PlanAmount - residue, - MaterialSpecificatons = item.MaterialSpecificatons, - StartDate = item.BeginTime - }); - i++; + int residue = 0; + if (execList == null) residue = 0; + else residue = (execList.Where(d => d.MaterialCode.Equals(item.MaterialCode))).Sum(d => d.PlanAmount); + MaterialDataGrid.Add(new ProductPlanInfoModel() + { + No = i, + PlanCode = item.PlanCode, + MaterialCode = item.MaterialCode, + MaterialName = item.MaterialName, + OrderCode = item.OrderCode, + PlanAmount = item.PlanAmount, + ResidueAmount = item.PlanAmount - item.CompleteAmount, + SpliteResidueAmount = item.PlanAmount - residue, + MaterialSpecificatons = item.MaterialSpecificatons, + StartDate = item.BeginTime + }); + i++; + } + } + catch (Exception ex) + { + log.Error($"根据搜索条件查询：{ex.Message}"); } await Task.CompletedTask; } diff --git a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml index c4e7cc01..0f61ea80 100644 --- a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml +++ b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml @@ -254,7 +254,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -385,7 +385,7 @@ - + diff --git a/Aucma.Core.SheetMetal/Views/LogPageView.xaml b/Aucma.Core.SheetMetal/Views/LogPageView.xaml index e641d04b..030479a7 100644 --- a/Aucma.Core.SheetMetal/Views/LogPageView.xaml +++ b/Aucma.Core.SheetMetal/Views/LogPageView.xaml @@ -7,6 +7,7 @@ mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" d:DesignHeight="450" d:DesignWidth="800" > + @@ -18,7 +19,24 @@ - + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.SheetMetal/Views/LogPageView.xaml.cs b/Aucma.Core.SheetMetal/Views/LogPageView.xaml.cs index 9cf94ebb..45a62011 100644 --- a/Aucma.Core.SheetMetal/Views/LogPageView.xaml.cs +++ b/Aucma.Core.SheetMetal/Views/LogPageView.xaml.cs @@ -26,5 +26,7 @@ namespace Aucma.Core.SheetMetal.Views InitializeComponent(); this.DataContext = new LogPageViewModel(); } + + } } diff --git a/Aucma.Core.SheetMetal/Views/MaterialStatisticsView.xaml b/Aucma.Core.SheetMetal/Views/MaterialStatisticsView.xaml index 1c095f78..f0566df4 100644 --- a/Aucma.Core.SheetMetal/Views/MaterialStatisticsView.xaml +++ b/Aucma.Core.SheetMetal/Views/MaterialStatisticsView.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:local="clr-namespace:Aucma.Core.SheetMetal.Views" mc:Ignorable="d" Background="#1152AC" FontFamily="Microsoft YaHei" Title="物料库存统计" Height="650" Width="1000" Name="window" WindowStartupLocation="CenterScreen" @@ -185,13 +186,35 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + - + [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.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 54fddce2..a4db58d9 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 = E:\桌面\AUCMA_SCADA\HwControlLib\ +build_property.ProjectDir = D:\Project\gitea\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 decde3af..a056af0d 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 eeabcb64..303b31a5 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 -E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\ +D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\ HwControlLib none false @@ -13,7 +13,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP 1204305769 71208292394 -194-1617825143 +194-2067936865 Themes\Generic.xaml; False diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json index 7ff994f6..8d86e7ef 100644 --- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json +++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json @@ -1,33 +1,28 @@ { "format": 1, "restore": { - "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {} + "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {} }, "projects": { - "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -63,7 +58,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props index 7eb906eb..d4531802 100644 --- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props +++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props @@ -5,13 +5,11 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\admin\.nuget\packages\ PackageReference - 6.5.0 + 6.7.0 - - - + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index 1558f2be..57c51ab1 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,34 +8,27 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\admin\\.nuget\\packages\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", - "fallbackFolders": [ - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" - ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -71,7 +64,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 248dc48c..7ca2e0be 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==", + "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==", "success": true, - "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file