From 81af2959e05a2b5e6222923ac271c6bf1303f28f Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Mon, 1 Jan 2024 10:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=8C=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.Core.Api/Admin.Core.Model.xml | 4 +- .../Admin.Core.Api.csproj.nuget.dgspec.json | 533 ++++++++---------- .../obj/Admin.Core.Api.csproj.nuget.g.props | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 142874 -> 140916 bytes Admin.Core.Api/obj/project.assets.json | 43 +- Admin.Core.Api/obj/project.nuget.cache | 452 +++++++-------- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Admin.Core.Model/Model_New/ExecutePlanInfo.cs | 2 +- .../Model_New/Perfusion_Record.cs | 2 +- .../ViewModels/ProductLineInfoView.cs | 3 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Admin.Core.RealTimeService/appsettings.json | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Service_New/SysUserInfoServices.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../QuartzNet/Jobs/Job_Perfusion_Quartz.cs | 217 +++---- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../ViewModels/FoamMonitorPageViewModel.cs | 198 +------ .../ViewModels/MainWindowViewModel.cs | 230 ++++++++ Aucma.Core.BoxFoam/appsettings.json | 3 +- Aucma.Core.PrintTo/Models/OrderInfo.cs | 2 +- .../ViewModels/IndexPageViewModel.cs | 16 +- Aucma.Core.PrintTo/Views/IndexPageView.xaml | 2 +- .../ViewModels/QuantityIssuedViewModel.cs | 15 +- Aucma.Core.SheetMetal/appsettings.json | 7 +- .../GeneratedInternalTypeHelper.g.i.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 265 -> 152 bytes .../HwControlLib_MarkupCompile.i.cache | 4 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 25 +- .../obj/HwControlLib.csproj.nuget.g.props | 8 +- HwControlLib/obj/project.assets.json | 25 +- HwControlLib/obj/project.nuget.cache | 4 +- 37 files changed, 904 insertions(+), 937 deletions(-) diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 7831849c..9dee074f 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -1938,7 +1938,7 @@ - 产线/工位 + 计划工位 @@ -2073,7 +2073,7 @@ - 箱体吗 + 箱体码 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 d8850da534819b613f49f14b373f108fc9d2c5c0..d57995efc7954aaf5f62c45db37abc2783259951 100644 GIT binary patch delta 17910 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 - /// 产线/工位 + /// 计划工位 /// [SugarColumn(ColumnName = "PRODUCTLINE_CODE")] public string ProductLineCode { get; set; } diff --git a/Admin.Core.Model/Model_New/Perfusion_Record.cs b/Admin.Core.Model/Model_New/Perfusion_Record.cs index e12c5ee1..8ef95dc0 100644 --- a/Admin.Core.Model/Model_New/Perfusion_Record.cs +++ b/Admin.Core.Model/Model_New/Perfusion_Record.cs @@ -20,7 +20,7 @@ namespace Admin.Core.Model public int ObjId { get; set; } /// - /// 箱体吗 + /// 箱体码 /// [SugarColumn(ColumnName = "PERFUSION_BOXCODE")] public string PerfusionBoxCode { get; set; } diff --git a/Admin.Core.Model/ViewModels/ProductLineInfoView.cs b/Admin.Core.Model/ViewModels/ProductLineInfoView.cs index 770a44af..177a3872 100644 --- a/Admin.Core.Model/ViewModels/ProductLineInfoView.cs +++ b/Admin.Core.Model/ViewModels/ProductLineInfoView.cs @@ -12,12 +12,13 @@ namespace Admin.Core.Model.ViewModels /// /// 公司 /// + [SugarColumn(ColumnName = "PLANT_CODE")] public string PlantCode { get; set; } /// /// 产线编码 /// - [SugarColumn(ColumnName = "PRODUCTLINE_CODE")] + [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")] public string ProductlineCode { get; set; } /// /// 工序 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index 173f98e4..f17e3fdc 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ diff --git a/Admin.Core.RealTimeService/appsettings.json b/Admin.Core.RealTimeService/appsettings.json index de4cda63..0f0631c3 100644 --- a/Admin.Core.RealTimeService/appsettings.json +++ b/Admin.Core.RealTimeService/appsettings.json @@ -97,15 +97,15 @@ "QuartzNetJob": [ { "ID": 1, - "Name": "TestTask", + "Name": "Job_Perfusion", "JobGroup": "DEFAULT", - "Cron": "*/5 * * * * ?", + "Cron": "*/6 * * * * ?", "AssemblyName": "Admin.Core.Tasks", - "ClassName": "Job_Admin_Quartz", - "Remark": "执行任务调度系统", + "ClassName": "Job_Perfusion_Quartz", + "Remark": "灌注执行任务系统", "RunTimes": 3881, "BeginTime": "2023-04-23 11:08:50.000", - "EndTime": "2324-08-06 16:45:30.000", + "EndTime": "2124-08-06 16:45:30.000", "TriggerType": 1, "IntervalSecond": 1, "CycleRunTimes": 1, 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/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 0571893f..267e56f5 100644 --- a/Admin.Core.Service/Service_New/SysUserInfoServices.cs +++ b/Admin.Core.Service/Service_New/SysUserInfoServices.cs @@ -59,7 +59,7 @@ namespace Admin.Core.IService { var list = await _sysUserInfoRepository.GetProductLineInfo(productLineCode); if (list == null) return null; - var obj = list.SingleOrDefault(d => d.ProductlineCode == productLineCode); + var obj = list.SingleOrDefault(d => d.StationCode == productLineCode); return obj; } } 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/QuartzNet/Jobs/Job_Perfusion_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs index e8b1662d..e17a4d2c 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_Perfusion_Quartz.cs @@ -6,6 +6,7 @@ using log4net; using NetTaste; using NPOI.SS.Formula.Functions; using Quartz; +using StackExchange.Profiling.Internal; using System; using System.Linq; using System.Threading.Tasks; @@ -22,6 +23,7 @@ namespace Admin.Core.Tasks protected readonly IPerfusionDeviceStatusServices _perfusionDeviceStatusServices; protected readonly IPerfusionAlarmServices _perfusionAlarmServices; protected readonly IPerfusionRecordServices _perfusionRecordServices; + private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding(); public Job_Perfusion_Quartz(ISysTasksQzService SysTasksQzService, ISysJobLogService sysJobLogService, IPerfusionDeviceStatusServices perfusionDeviceStatusServices, IPerfusionAlarmServices perfusionAlarmServices, @@ -55,7 +57,7 @@ namespace Admin.Core.Tasks { log.Error("灌注PLC连接异常！"); } - } + } #endregion #region 保存灌注数据 @@ -63,122 +65,139 @@ namespace Admin.Core.Tasks { string alarmName = string.Empty; var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("PerfusionPlc")); + if (obj == null) return; if (obj.plc.IsConnected) { - var endSignal = obj.plc.ReadInt16("DB55.44.0");//任务结束信号存盘 - /* - * 8：正常结束，充注成功 - * 4：异常结束，充注不成功 - * */ - if (endSignal == 8) + var lenby = obj.plc.Read("DB55.20.0",24);//箱体条码 + string barCode = asciiEncoding.GetString(lenby.Skip(0).Take(21).ToArray()).Trim('\n'); + + var perfusionRecordMoel = await _perfusionRecordServices.FirstAsync(d => d.PerfusionBoxCode.Equals(barCode) && d.PerfusionResult == 8); + if (perfusionRecordMoel != null) return; + { - try + var endSignal = obj.plc.ReadInt16("DB55.44.0");//任务结束信号存盘 + /* + * 8：正常结束，充注成功 + * 4：异常结束，充注不成功 + * */ + if (endSignal == 8) { - var barCode = obj.plc.ReadString("DB55.20.0");//箱体条码 - var perfusionRecord = await _perfusionRecordServices.FirstAsync(d=>d.PerfusionBoxCode.Equals(barCode)); - if (perfusionRecord == null) return; + try + { + var perfusionRecord = await _perfusionRecordServices.FirstAsync(d => d.PerfusionBoxCode.Equals(barCode)); + if (perfusionRecord == null) return; - var refrigerantTypeLeft = obj.plc.ReadString("DB55.58.0");//冷媒类型——左侧冷媒型号 - var refrigerantTypeRight = obj.plc.ReadString("DB55.68.0");//冷媒类型——右侧冷媒型号 - var setVolume = obj.plc.ReadDouble("DB55.78.0");//设定灌注量 - var actualVolume = obj.plc.ReadDouble("DB55.0.0");//实际灌注量 - var pressureR = obj.plc.ReadDouble("DB55.8.0");//灌注压力——灌注压力_R - var pressureL = obj.plc.ReadDouble("DB55.50.0");//灌注压力——灌注压力_L - var duration = obj.plc.ReadInt16("DB55.12.0");//灌注时长 - var system = obj.plc.ReadInt32("DB55.82.0");//0,右系统 1，左系统 - var result = obj.plc.ReadInt16("DB55.44.0");//灌注结果 + var refrigerantTypeLeft = obj.plc.ReadString("DB55.58.0");//冷媒类型——左侧冷媒型号 + var refrigerantTypeRight = obj.plc.ReadString("DB55.68.0");//冷媒类型——右侧冷媒型号 + var setVolume = obj.plc.ReadDouble("DB55.78.0");//设定灌注量 + var actualVolume = obj.plc.ReadDouble("DB55.0.0");//实际灌注量 + var pressureR = obj.plc.ReadDouble("DB55.8.0");//灌注压力——灌注压力_R + var pressureL = obj.plc.ReadDouble("DB55.50.0");//灌注压力——灌注压力_L + var duration = obj.plc.ReadInt16("DB55.12.0");//灌注时长 + var system = obj.plc.ReadInt32("DB55.82.0");//0,右系统 1，左系统 + var result = obj.plc.ReadInt16("DB55.44.0");//灌注结果 - Perfusion_Record record = new Perfusion_Record(); - record.PerfusionBoxCode = barCode; - record.PerfusionRefrigerantTypeLeft = refrigerantTypeLeft; - record.PerfusionRefrigerantTypeRight = refrigerantTypeRight; - record.PerfusionSetVolume = setVolume.ToString(); - record.PerfusionActualVolume = actualVolume.ToString(); - record.PerfusionR = pressureR.ToString(); - record.PerfusionL = pressureL.ToString(); - record.PerfusionDuration = duration.ToString(); - record.PerfusionResult =Convert.ToInt32(result);//灌注结果 + Perfusion_Record record = new Perfusion_Record(); + record.PerfusionBoxCode = barCode; + record.PerfusionRefrigerantTypeLeft = refrigerantTypeLeft; + record.PerfusionRefrigerantTypeRight = refrigerantTypeRight; + record.PerfusionSetVolume = setVolume.ToString(); + record.PerfusionActualVolume = actualVolume.ToString(); + record.PerfusionR = pressureR.ToString(); + record.PerfusionL = pressureL.ToString(); + record.PerfusionDuration = duration.ToString(); + record.PerfusionResult = Convert.ToInt32(result);//灌注结果 - var r = await _perfusionRecordServices.AddAsync(record); - if (r > 0) - { - //数据采集完成设为2 - obj.plc.WriteInt32("DB55.444.0", 2);//应答字:1数据采集，2存盘成功 + var r = await _perfusionRecordServices.AddAsync(record); + if (r > 0) + { + //数据采集完成设为2 + obj.plc.WriteInt32("DB55.444.0", 2);//应答字:1数据采集，2存盘成功 + + Console.WriteLine($"灌注数据保存成功!=>数据写入2存盘成功:{record.ToJson()}"); + } + else + { + log.Error($"存盘数据失败，箱体码[{barCode}]"); + Console.WriteLine($"存盘数据失败，箱体码[{barCode}]"); + } } - else + catch (Exception ex) { - log.Error($"存盘数据失败，箱体码[{barCode}]"); + log.Error(ex.Message); + Console.WriteLine($"数据异常[{ex.Message}]"); } } - catch (Exception ex) - { - log.Error(ex.Message); - } - - } - /* - *2:充注枪真空不合格 - *4：充注故障 - *8：充注时真空度超限定 - *16：回升检测不合格 - *32：工件真空不合格 - *64：平衡缸接近开关异常 - *128：增压超时 - *256：风压不足 - * */ - if (endSignal == 4) - { - try + /* + *2:充注枪真空不合格 + *4：充注故障 + *8：充注时真空度超限定 + *16：回升检测不合格 + *32：工件真空不合格 + *64：平衡缸接近开关异常 + *128：增压超时 + *256：风压不足 + * */ + if (endSignal == 4) { - var barCode = obj.plc.ReadString("DB55.20.0");//箱体条码 - var perfusionAlarm = await _perfusionAlarmServices.FirstAsync(d => d.PerfusionBoxcode.Equals(barCode)); - if (perfusionAlarm != null) return; + try + { + //var barCode = obj.plc.ReadString("DB55.20.0");//箱体条码 + var perfusionAlarm = await _perfusionAlarmServices.FirstAsync(d => d.PerfusionBoxcode.Equals(barCode)); + if (perfusionAlarm != null) return; - var alarm = obj.plc.ReadInt32("DB55.48.0"); - //保存到异常任务表中,通知返修检测 - switch (alarm) + var alarm = obj.plc.ReadInt32("DB55.48.0"); + //保存到异常任务表中,通知返修检测 + switch (alarm) + { + case 0: + alarmName = "充注枪真空不合格"; + break; + case 4: + alarmName = "充注故障"; + break; + case 8: + alarmName = "充注时真空度超限定"; + break; + case 16: + alarmName = "回升检测不合格"; + break; + case 32: + alarmName = "工件真空不合格"; + break; + case 64: + alarmName = "平衡缸接近开关异常"; + break; + case 128: + alarmName = "增压超时"; + break; + case 256: + alarmName = "风压不足"; + break; + default: + break; + } + Perfusion_Alarm alarm1 = new Perfusion_Alarm(); + alarm1.PerfusionBoxcode = barCode; + alarm1.PerfusionStatus = alarm; + alarm1.PerfusionAlarm = alarmName; + alarm1.PerfusionCompleted = "1";//异常取消 + int r=await _perfusionAlarmServices.AddAsync(alarm1); + if (r>0) + { + Console.WriteLine($"异常数据保存成功！{alarm1.ToJson()}"); + } + } + catch (Exception ex) { - case 0: - alarmName = "充注枪真空不合格"; - break; - case 4: - alarmName = "充注故障"; - break; - case 8: - alarmName = "充注时真空度超限定"; - break; - case 16: - alarmName = "回升检测不合格"; - break; - case 32: - alarmName = "工件真空不合格"; - break; - case 64: - alarmName = "平衡缸接近开关异常"; - break; - case 128: - alarmName = "增压超时"; - break; - case 256: - alarmName = "风压不足"; - break; - default: - break; + log.Error(ex.Message); + Console.WriteLine($"数据异常[{ex.Message}]"); } - Perfusion_Alarm alarm1 = new Perfusion_Alarm(); - alarm1.PerfusionBoxcode = barCode; - alarm1.PerfusionStatus = alarm; - alarm1.PerfusionAlarm = alarmName; - alarm1.PerfusionCompleted = "1";//异常取消 - await _perfusionAlarmServices.AddAsync(alarm1); - } - catch (Exception ex) - { - log.Error(ex.Message); } + } } - } + } #endregion } 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.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index f2f46726..60b1341a 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -34,7 +34,7 @@ namespace Aucma.Core.BoxFoam.ViewModels private readonly IBoxFoamDataRecordServices _boxFoamDataRecordServices; private readonly IBoxFoamDataRealTimeServices? _boxFoamDataRealTimeServices; private readonly IBoxFoamDataRealTimeHistoryServices _boxFoamDataRealTimeHistoryServices; - System.Timers.Timer timer2 = new System.Timers.Timer(5000); + System.Timers.Timer timer2 = new System.Timers.Timer(3000); int totalAmount = 0; @@ -46,13 +46,9 @@ namespace Aucma.Core.BoxFoam.ViewModels _currentTeamTimeServices = App.ServiceProvider.GetService(); _boxFoamDataRealTimeHistoryServices = App.ServiceProvider.GetService(); _sysUserInfoServices = App.ServiceProvider.GetService(); + CollectionFoamLine.RefreshBoxFoamDataDelegateEvent += InitData; - timer2.Elapsed += new System.Timers.ElapsedEventHandler(RealTimeFoamingTask); //到达时间的时候执行事件； - timer2.AutoReset = true;//设置是执行一次（false）还是一直执行(true)； - timer2.Enabled = true;//需要调用 timer.Start()或者timer.Enabled = true来启动它， - timer2.Start();//timer.Start()的内部原理还是设置timer.Enabled = true - //Task.WaitAll(InitData()); } @@ -317,197 +313,7 @@ namespace Aucma.Core.BoxFoam.ViewModels } #endregion - Semaphore semaphore = new Semaphore(1, 1); - /// - /// 将采集到的数据保存 - /// - /// - - public async void RealTimeFoamingTask(object? sender, ElapsedEventArgs e) - { - semaphore.WaitOne(); - try - { - string productLineCode = Appsettings.app("StationInfo", "ProductLineCode"); - - DateTime now = DateTime.Now; - List timeList = await _currentTeamTimeServices.QueryAsync(d => d.StartTime <= now && d.EndTime >= now); - - if (timeList.Count>0) - { - ExecHourDataAsync(productLineCode); - } - else - { - ShiftChangeAsync(productLineCode); - } - - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - } - finally - { - semaphore.Release(); - } - } - - public async void ExecHourDataAsync(string productLineCode) - { - List bLis = CollectionFoamLine.listFixtureStatus; - if (bLis.Count == 0) return; - List planList = await _boxFoamPlanServices.QueryAsync(); - List bfds = await _boxFoamDataRealTimeServices.QueryAsync(); - for (int j = 0; j < bLis.Count; j++) - { - try - { - if (string.IsNullOrEmpty(bLis[j].FixtureBoxType)) continue; - BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == bLis[j].FixtureBoxType && d.PlanAmount > d.CompleteAmount); - if (plan != null) - { - int complateAmount = 0; - BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId); - if (bfd != null) - { - - //更新计划数量 - complateAmount = bLis[j].Yield - bfd.FixtureProductioncapacity; - UpdateClampData(bLis[j], bfd); - } - else - { - FixtureStatus fixtureStatus = bLis[j]; - SaveClampData(productLineCode, fixtureStatus); - } - plan.CompleteAmount = plan.CompleteAmount + complateAmount; - if (complateAmount>0) - { - //保存历史记录 - BoxFoamDataRealTimeHistory history = new BoxFoamDataRealTimeHistory(); - - history.PlantCode = bfd.PlantCode; - history.ProductlineCode = bfd.ProductlineCode; - history.ProcessCode = bfd.ProcessCode; - history.StationCode= bfd.StationCode; - history.FixtureProductioncapacity = bLis[j].Yield; - history.FixtureCuringtimesettingvalue = bLis[j].PlanCuringTime.ToString(); - history.FixtureActualtime = bLis[j].RealCuringTime.ToString(); - history.ModeInternaltemperature = bLis[j].InternalTemperature; - history.ModeOutsidetemperature = bLis[j].InternalTemperature; - history.UpdatedTime = DateTime.Now; - //事务合并 - await _boxFoamDataRealTimeHistoryServices.AddAsync(history); - await _boxFoamPlanServices.UpdateAsync(plan); - } - } - else - { - //更新小时数据 - BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId); - if (bfd != null) - { - UpdateClampData(bLis[j], bfd); - } - else - { - SaveClampData(productLineCode, bLis[j]); - } - } - } - catch { } - } - } - private async void ShiftChangeAsync(string productLineCode) - { - try - { - //切换班组计划 - var currentTeamTimeList = await _sysUserInfoServices.GetTeamData(); - if (currentTeamTimeList.Count == 0) return; - var list = await _boxFoamDataRealTimeServices.QueryAsync(d => d.ProductlineCode == productLineCode); - //更新计划表操作 - CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync(); - currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName; - currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime); - currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime); - - bool result = await _currentTeamTimeServices.UpdateAsync(currentTeamTime); - if (result) - { - var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); - if (obj2 == null) { return; } - - //清空 当班计划 - var realTimeList = await _boxFoamDataRealTimeHistoryServices.QueryAsync(d => d.ProductlineCode == productLineCode); - await _boxFoamDataRealTimeHistoryServices.DeletesAsync(realTimeList); - - var plan = await _boxFoamPlanServices.QueryAsync(d => d.ProductLineCode == productLineCode); - await _boxFoamPlanServices.DeletesAsync(plan); - } - } - catch { } - } - - - #region 更新夹具型号 - /// - /// 更新夹具型号 - /// - public async void UpdateClampData(FixtureStatus fixtureStatus, BoxFoamDataRealTime bfd) - { - - try - { - bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType; - bfd.FixtureStatus = fixtureStatus.Status.ToString(); - bfd.FixtureProductioncapacity = fixtureStatus.Yield; - bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString(); - bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString(); - bfd.ModeInternaltemperature = fixtureStatus.InternalTemperature; - bfd.ModeOutsidetemperature = fixtureStatus.InternalTemperature; - bfd.Beat = fixtureStatus.Yield.ToString(); - bfd.UpdatedTime = DateTime.Now; - - await _boxFoamDataRealTimeServices.UpdateAsync(bfd); - } - catch { } - } - #endregion - - #region 新增夹具型号 - /// - /// 更新夹具型号 - /// - public async void SaveClampData(string productLineCode,FixtureStatus fixtureStatus) - { - var obj=await _sysUserInfoServices.GetProductLineInfo(productLineCode); - if (obj!=null) - { - BoxFoamDataRealTime bfd = new BoxFoamDataRealTime(); - - bfd.PlantCode = obj.PlantCode; - bfd.ProductlineCode = productLineCode; - bfd.ProcessCode = obj.ProcessCode; - bfd.StationCode = obj.StationCode; - bfd.SerialNumber = fixtureStatus.ObjId; - bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType; - bfd.FixtureStatus = fixtureStatus.Status.ToString(); - bfd.FixtureProductioncapacity = fixtureStatus.Yield; - bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString(); - bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString(); - bfd.ModeInternaltemperature = fixtureStatus.InternalTemperature; - bfd.ModeOutsidetemperature = fixtureStatus.InternalTemperature; - bfd.CreatedTime = DateTime.Now; - bfd.UpdatedTime = DateTime.Now; - - await _boxFoamDataRealTimeServices.AddAsync(bfd); - } - - } - #endregion } } diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index 3b8c0389..c5ed79f4 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -12,17 +12,46 @@ using Aucma.Core.Scanner; using System.Linq; using System.Threading.Tasks; using Aucma.Core.BoxFoam.Business; +using Admin.Core.IService; +using Microsoft.Extensions.DependencyInjection; +using Admin.Core.Model; +using System.Collections.Generic; +using System.Timers; +using Aucma.Core.BoxFoam.Models; namespace Aucma.Core.BoxFoam.ViewModels { public partial class MainWindowViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel)); + private readonly IBoxFoamDataServices _boxFoamDataServices; + private readonly ICurrentTeamTimeServices _currentTeamTimeServices; + private readonly IBoxFoamDataServices? _oldBoxFoamDataServices; + private readonly IBoxFoamPlanServices _boxFoamPlanServices; + private readonly ISysUserInfoServices _sysUserInfoServices; + private readonly IBoxFoamDataRecordServices _boxFoamDataRecordServices; + private readonly IBoxFoamDataRealTimeServices? _boxFoamDataRealTimeServices; + private readonly IBoxFoamDataRealTimeHistoryServices _boxFoamDataRealTimeHistoryServices; + System.Timers.Timer timer2 = new System.Timers.Timer(5000); + private IndexPageView firstPage = new IndexPageView();//首页 CollectionFoamLine line=new CollectionFoamLine(); public MainWindowViewModel() { UserContent = firstPage; + + _boxFoamPlanServices = App.ServiceProvider.GetService(); + _boxFoamDataRealTimeServices = App.ServiceProvider.GetService(); + _boxFoamDataRecordServices = App.ServiceProvider.GetService(); + _currentTeamTimeServices = App.ServiceProvider.GetService(); + _boxFoamDataRealTimeHistoryServices = App.ServiceProvider.GetService(); + _sysUserInfoServices = App.ServiceProvider.GetService(); + + + timer2.Elapsed += new System.Timers.ElapsedEventHandler(RealTimeFoamingTask); //到达时间的时候执行事件； + timer2.AutoReset = true;//设置是执行一次（false）还是一直执行(true)； + timer2.Enabled = true;//需要调用 timer.Start()或者timer.Enabled = true来启动它， + timer2.Start();//timer.Start()的内部原理还是设置timer.Enabled = true Task.Run(() => { init(); @@ -399,5 +428,206 @@ namespace Aucma.Core.BoxFoam.ViewModels }); } #endregion + + + #region 实时更新发泡计划 + Semaphore semaphore = new Semaphore(1, 1); + /// + /// 将采集到的数据保存 + /// + /// + + public async void RealTimeFoamingTask(object? sender, ElapsedEventArgs e) + { + semaphore.WaitOne(); + try + { + string productLineCode = Appsettings.app("StoreInfo", "ProductLineCode"); + + DateTime now = DateTime.Now; + List timeList = await _currentTeamTimeServices.QueryAsync(d => d.StartTime <= now && d.EndTime >= now); + if (timeList == null) return; + if (timeList.Count > 0) + { + ExecHourDataAsync(productLineCode); + } + else + { + ShiftChangeAsync(productLineCode); + } + + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + finally + { + semaphore.Release(); + } + } + + public async void ExecHourDataAsync(string productLineCode) + { + + List stateList = CollectionFoamLine.listFixtureStatus; + if (stateList.Count == 0) return; + List bLis = new List(); + bLis.AddRange(stateList); + List planList = await _boxFoamPlanServices.QueryAsync(); + List bfds = await _boxFoamDataRealTimeServices.QueryAsync(); + for (int j = 0; j < bLis.Count; j++) + { + try + { + string boxType = bLis[j].FixtureBoxType.ToString(); + string hh = boxType.Replace("\0", "").Trim(); + if (string.IsNullOrEmpty(boxType)) continue; + BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == boxType && d.PlanAmount > d.CompleteAmount); + if (plan != null) + { + int complateAmount = 0; + BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == boxType && d.SerialNumber == bLis[j].ObjId); + if (bfd != null) + { + + //更新计划数量 + complateAmount = bLis[j].Yield - bfd.FixtureProductioncapacity; + UpdateClampData(bLis[j], bfd); + } + else + { + FixtureStatus fixtureStatus = bLis[j]; + SaveClampData(productLineCode, fixtureStatus); + } + plan.CompleteAmount = plan.CompleteAmount + complateAmount; + if (complateAmount > 0) + { + //保存历史记录 + BoxFoamDataRealTimeHistory history = new BoxFoamDataRealTimeHistory(); + + history.PlantCode = bfd.PlantCode; + history.ProductlineCode = bfd.ProductlineCode; + history.ProcessCode = bfd.ProcessCode; + history.StationCode = bfd.StationCode; + history.FixtureProductioncapacity = bLis[j].Yield; + history.FixtureCuringtimesettingvalue = bLis[j].PlanCuringTime.ToString(); + history.FixtureActualtime = bLis[j].RealCuringTime.ToString(); + history.ModeInternaltemperature = bLis[j].InternalTemperature; + history.ModeOutsidetemperature = bLis[j].InternalTemperature; + history.UpdatedTime = DateTime.Now; + //事务合并 + await _boxFoamDataRealTimeHistoryServices.AddAsync(history); + await _boxFoamPlanServices.UpdateAsync(plan); + } + } + else + { + //更新小时数据 + BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId); + if (bfd != null) + { + UpdateClampData(bLis[j], bfd); + } + else + { + SaveClampData(productLineCode, bLis[j]); + } + } + } + catch { } + } + } + + private async void ShiftChangeAsync(string productLineCode) + { + try + { + //切换班组计划 + var currentTeamTimeList = await _sysUserInfoServices.GetTeamData(); + if (currentTeamTimeList.Count == 0) return; + var list = await _boxFoamDataRealTimeServices.QueryAsync(d => d.ProductlineCode == productLineCode); + //更新计划表操作 + CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync(); + currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName; + currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime); + currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime); + + bool result = await _currentTeamTimeServices.UpdateAsync(currentTeamTime); + if (result) + { + var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); + if (obj2 == null) { return; } + + //清空 当班计划 + var realTimeList = await _boxFoamDataRealTimeHistoryServices.QueryAsync(d => d.ProductlineCode == productLineCode); + await _boxFoamDataRealTimeHistoryServices.DeletesAsync(realTimeList); + + var plan = await _boxFoamPlanServices.QueryAsync(d => d.ProductLineCode == productLineCode); + await _boxFoamPlanServices.DeletesAsync(plan); + } + } + catch { } + } + + + #region 更新夹具型号 + /// + /// 更新夹具型号 + /// + public async void UpdateClampData(FixtureStatus fixtureStatus, BoxFoamDataRealTime bfd) + { + + try + { + bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType; + bfd.FixtureStatus = fixtureStatus.Status.ToString(); + bfd.FixtureProductioncapacity = fixtureStatus.Yield; + bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString(); + bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString(); + bfd.ModeInternaltemperature = fixtureStatus.InternalTemperature; + bfd.ModeOutsidetemperature = fixtureStatus.InternalTemperature; + bfd.Beat = fixtureStatus.Yield.ToString(); + bfd.UpdatedTime = DateTime.Now; + + await _boxFoamDataRealTimeServices.UpdateAsync(bfd); + } + catch { } + } + #endregion + + #region 新增夹具型号 + /// + /// 更新夹具型号 + /// + public async void SaveClampData(string productLineCode, FixtureStatus fixtureStatus) + { + string stationCode = Appsettings.app("StoreInfo", "StationCode"); + + var obj = await _sysUserInfoServices.GetProductLineInfo(stationCode); + if (obj != null) + { + BoxFoamDataRealTime bfd = new BoxFoamDataRealTime(); + + bfd.PlantCode = obj.PlantCode; + bfd.ProductlineCode = productLineCode; + bfd.ProcessCode = obj.ProcessCode; + bfd.SerialNumber = fixtureStatus.ObjId; + bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType; + bfd.FixtureStatus = fixtureStatus.Status.ToString(); + bfd.FixtureProductioncapacity = fixtureStatus.Yield; + bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString(); + bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString(); + bfd.ModeInternaltemperature = fixtureStatus.InternalTemperature; + bfd.ModeOutsidetemperature = fixtureStatus.InternalTemperature; + bfd.CreatedTime = DateTime.Now; + bfd.UpdatedTime = DateTime.Now; + + await _boxFoamDataRealTimeServices.AddAsync(bfd); + } + + } + #endregion + #endregion } } diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index 06d8764a..f1125f01 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/Aucma.Core.BoxFoam/appsettings.json @@ -219,7 +219,8 @@ "LinerInventory": "NDJCK-001", "AfterStoreCode": "FPJCK-001", "BeforeStoreCode": "PBSCK-001", - "ProductlineCode": "CX_02" + "ProductlineCode": "CX_02", + "StationCode": "1001" }, "IpRateLimiting": { "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each diff --git a/Aucma.Core.PrintTo/Models/OrderInfo.cs b/Aucma.Core.PrintTo/Models/OrderInfo.cs index d884dd31..77519a6e 100644 --- a/Aucma.Core.PrintTo/Models/OrderInfo.cs +++ b/Aucma.Core.PrintTo/Models/OrderInfo.cs @@ -31,7 +31,7 @@ namespace Aucma.Core.PrintTo.Models /// /// 计划数量 /// - public int PlanAmount { get; set; } = 0; + public int PlanAmount { get; set; } /// /// 完成量 /// diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index ab54e394..1dc62552 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -2,6 +2,7 @@ using Admin.Core.Model.ViewModels; using Aucma.Core.PrintTo.Models; using Aucma.Core.PrintTo.Views; +using Castle.Core.Internal; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; @@ -165,14 +166,25 @@ namespace Aucma.Core.PrintTo.ViewModels MessageBox.Show("请选中需要打印的产品！","系统提醒"); return; } + if (string.IsNullOrEmpty(SelectedCells.PrintName)) { MessageBox.Show("打印名称不可为空！", "系统提醒"); return; } - if (string.IsNullOrEmpty(SelectedCells.PrintName)) + if (SelectedCells.PlanAmount == 0) { - MessageBox.Show("打印名称不可为空！", "系统提醒"); + MessageBox.Show("请输入打印数量！", "系统提醒"); + return; + } + if (SelectedCells.PlanAmount == 0) + { + MessageBox.Show("请输入打印数量！", "系统提醒"); + return; + } + if (SelectedCells.PlanAmount == 0) + { + MessageBox.Show("请输入打印数量！", "系统提醒"); return; } try diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml index 818a50c1..3608c2e9 100644 --- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml @@ -233,7 +233,7 @@ - diff --git a/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs index e8cdcd8b..1e41ee26 100644 --- a/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/QuantityIssuedViewModel.cs @@ -23,6 +23,9 @@ namespace Aucma.Core.SheetMetal.ViewModels { public partial class QuantityIssuedViewModel : ObservableObject { + public delegate Task RefreshSheetMetalDataDelegate(); + public static event RefreshSheetMetalDataDelegate RefreshSheetMetalDataDelegateEvent; + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(QuantityIssuedViewModel)); private IBaseBomInfoServices _bomInfoServices; private IBaseSpaceDetailServices _spaceDetailServices; @@ -65,15 +68,15 @@ namespace Aucma.Core.SheetMetal.ViewModels if (productPlanInfo != null) { //下传到PLC - string stationCode = "1001"; - var list = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(stationCode)); + string productLineCode = Appsettings.app("StationInfo", "ProductLineCode"); + var list = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(productLineCode)); ExecutePlanInfo task = new ExecutePlanInfo(); task.ExecutePlanCode = Guid.NewGuid().ToString(); task.ProductPlanCode = PlanInfo.PlanCode; task.OrderCode = PlanInfo.OrderCode; - task.ProductLineCode = stationCode;//计划工位 - //task.TaskCode = GetMaxCodeAsync(); + task.ProductLineCode = productLineCode;//计划工位 + task.TaskCode = GetMaxCodeAsync(); task.TaskCode = System.Guid.NewGuid().ToString("N").Substring(0,16); task.MaterialCode = PlanInfo.MaterialCode; task.MaterialName = PlanInfo.MaterialName; @@ -93,8 +96,10 @@ namespace Aucma.Core.SheetMetal.ViewModels var result = await _executePlanInfoServices.AddAsync(task); if (result > 0) { + RefreshSheetMetalDataDelegateEvent?.Invoke(); MessageBox.Show("计划拆分成功！", "系统提醒"); - WeakReferenceMessenger.Default.Send("Refresh");//刷新窗口 + + //WeakReferenceMessenger.Default.Send("Refresh");//刷新窗口 } else { diff --git a/Aucma.Core.SheetMetal/appsettings.json b/Aucma.Core.SheetMetal/appsettings.json index c91252d6..7cda3508 100644 --- a/Aucma.Core.SheetMetal/appsettings.json +++ b/Aucma.Core.SheetMetal/appsettings.json @@ -39,14 +39,13 @@ PostgreSQL = 4, Dm = 5,//达梦 Kdbndp = 6,//人大金仓 - */ - { + */ { "ConnId": "AUCMA_SCADA", "DBType": 3, "Enabled": true, "HitRate": 50, //"Connection": "Data Source=localhost;Initial Catalog=Hsdb;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", - "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_scada;Password=aucma;", + "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.100.72.20)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=ORCLCDB)));User ID=c##aucma_scada;Password=aucma;", "ProviderName": "System.Data.SqlClient" }, { @@ -54,7 +53,7 @@ "DBType": 3, "Enabled": true, "HitRate": 40, - "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_mes;Password=aucma;", + "Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.100.72.20)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=ORCLCDB)));User ID=c##aucma_mes;Password=aucma;", "ProviderName": "System.Data.SqlClient" } ], diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index 57f88858..36288f46 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.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 decde3af09d0c22125e131bf62df934b15aa51db..a056af0d3f9dc463157ec9d2f3a3a69d49f71e33 100644 GIT binary patch literal 152 zcmWIWc6a1qU|?Xq@9Jg9SCTDi6U!hcgGHs#b-%!P^sj>5aOaZDP7BB)8 n$~#-dgche36~`o|biU}=FEh>)jNzKbI%a75^D@{)=i77}-&Q45EEsg=1W$t1X^K?(c)BcH1w=aF# zx;-W=v$!-dMpwIl$l8KhSqXhA?xetJ=2u7X=; j4$#Du{E|GN4aF(h5Y=vpIXOu{9d7wKDXB#uJ@^0sWw1zb 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