From f8884006b7e927a919f8e4e4022f7266e91a8264 Mon Sep 17 00:00:00 2001 From: wenjy Date: Sat, 13 Jan 2024 20:19:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change=20-=20=E8=80=81=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E7=BA=BF=E6=B7=BB=E5=8A=A0=E5=9E=8B=E5=8F=B7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 140916 -> 142874 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 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../ViewModels/OldBoxFoamPageViewModel.cs | 31 + .../Views/OldBoxFoamPageView.xaml | 102 ++-- .../Views/OldBoxFoamPageView.xaml.cs | 216 +++++++ .../GeneratedInternalTypeHelper.g.i.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 152 -> 265 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 +- 23 files changed, 913 insertions(+), 560 deletions(-) diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index 0a98b80a..fe5e8758 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -1,41 +1,46 @@ { "format": 1, "restore": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -78,36 +83,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -263,36 +273,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -332,60 +347,65 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" } } } @@ -421,39 +441,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -483,39 +508,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -545,36 +575,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -604,36 +639,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -663,29 +703,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -748,42 +793,47 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -813,48 +863,53 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -890,29 +945,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -951,29 +1011,34 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1012,39 +1077,44 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1074,36 +1144,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1139,36 +1214,41 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1204,42 +1284,47 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1269,7 +1354,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index a5a55588..15920027 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -5,18 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + - C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 601c80d9..d1d06cea 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index d57995efc7954aaf5f62c45db37abc2783259951..d8850da534819b613f49f14b373f108fc9d2c5c0 100644 GIT binary patch delta 20387 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 d.Id == plcId); + if (plc != null) + { + bool isFlag = plc.plc.WriteInt16(address, setBoxTypeView.boxTypeResult); + + if (isFlag) + { + System.Windows.MessageBox.Show("货道型号设置成功"); + } + else + { + System.Windows.MessageBox.Show("货道型号设置失败"); + } + } + } + } + } + } + #region 原班组切换逻辑 Delete By wenjy 2024-01-08 11:17:00 //private async void ShiftChange(string productLineCode) //{ diff --git a/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml b/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml index 5840dca5..1dff8ae1 100644 --- a/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml +++ b/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml @@ -67,7 +67,7 @@ - + @@ -195,41 +195,41 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -399,41 +399,41 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -515,6 +515,6 @@ - - + + diff --git a/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml.cs b/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml.cs index 094a0394..dd7e4690 100644 --- a/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml.cs +++ b/Aucma.Core.OldBoxFoam/Views/OldBoxFoamPageView.xaml.cs @@ -26,5 +26,221 @@ namespace Aucma.Core.OldBoxFoam.Views InitializeComponent(); this.DataContext = new OldBoxFoamPageViewModel(); } + + private void Border_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type1.Text; + int fixCode = 1; + var plcId = 1; + var plcAddress = "D3140"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_2(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type2.Text; + int fixCode = 2; + var plcId = 1; + var plcAddress = "D3142"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_3(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type3.Text; + int fixCode = 3; + var plcId = 1; + var plcAddress = "D3144"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_4(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type4.Text; + int fixCode = 4; + var plcId = 1; + var plcAddress = "D3148"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_5(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type5.Text; + int fixCode = 5; + var plcId = 1; + var plcAddress = "D3150"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_6(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type6.Text; + int fixCode = 6; + var plcId = 1; + var plcAddress = "D3152"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_7(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type7.Text; + int fixCode = 7; + var plcId = 2; + var plcAddress = "D3140"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_8(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type8.Text; + int fixCode = 8; + var plcId = 2; + var plcAddress = "D3142"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_9(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type9.Text; + int fixCode = 9; + var plcId = 2; + var plcAddress = "D3144"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_10(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type10.Text; + int fixCode = 10; + var plcId = 2; + var plcAddress = "D3148"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_11(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type11.Text; + int fixCode = 11; + var plcId = 2; + var plcAddress = "D3150"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_12(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type12.Text; + int fixCode = 12; + var plcId = 2; + var plcAddress = "D3152"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_13(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type13.Text; + int fixCode = 13; + var plcId = 3; + var plcAddress = "D3140"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_14(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type14.Text; + int fixCode = 14; + var plcId = 3; + var plcAddress = "D3142"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_15(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type15.Text; + int fixCode = 15; + var plcId = 3; + var plcAddress = "D3144"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_16(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type16.Text; + int fixCode = 16; + var plcId = 3; + var plcAddress = "D3148"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_17(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type17.Text; + int fixCode = 17; + var plcId = 3; + var plcAddress = "D3150"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_18(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type18.Text; + int fixCode = 18; + var plcId = 3; + var plcAddress = "D3152"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_19(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type19.Text; + int fixCode = 19; + var plcId = 4; + var plcAddress = "D3140"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_20(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type20.Text; + int fixCode = 20; + var plcId = 4; + var plcAddress = "D3142"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_21(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type21.Text; + int fixCode = 21; + var plcId = 4; + var plcAddress = "D3144"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_22(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type22.Text; + int fixCode = 22; + var plcId = 4; + var plcAddress = "D3148"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_23(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type23.Text; + int fixCode = 23; + var plcId = 4; + var plcAddress = "D3150"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } + + private void Border_MouseLeftButtonDown_24(object sender, MouseButtonEventArgs e) + { + var boxTypeStr = this.Type24.Text; + int fixCode = 24; + var plcId = 4; + var plcAddress = "D3152"; + OldBoxFoamPageViewModel.MouseClick(boxTypeStr, plcId, plcAddress); + } } } diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index 36288f46..57f88858 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index a4db58d9..54fddce2 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index a056af0d3f9dc463157ec9d2f3a3a69d49f71e33..decde3af09d0c22125e131bf62df934b15aa51db 100644 GIT binary patch literal 265 zcmWIWc6a1qU|?8kDfadCLeXf^57!-a7k0l+zAeJyz9g1&wdn2p^RFHF#mWd&L?mDa zs#9>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 literal 152 zcmWIWc6a1qU|?Xq@9Jg9SCTDi6U!hcgGHs#b-%!P^sj>5aOaZDP7BB)8 n$~#-dgche36~`o|NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index 57c51ab1..1558f2be 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,27 +8,34 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -64,7 +71,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 7ca2e0be..248dc48c 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==", + "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==", "success": true, - "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file From 0e846b372ab5d9f594a58cadf95bade76a1aba24 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Sat, 13 Jan 2024 22:51:14 +0800 Subject: [PATCH 2/2] new --- .../Aucma.Core.Palletiz.csproj | 3 - .../Aucma.Core.Palletiz.csproj.user | 9 - .../ViewModels/IndexPageViewModel.cs | 18 +- .../ViewModels/MainWindowViewModel.cs | 64 +++ .../ViewModels/SplitPlanViewModel.cs | 16 +- Aucma.Core.Palletiz/Views/IndexPageView.xaml | 13 +- Aucma.Core.Palletiz/Views/MainWindow.xaml | 19 +- .../Views/PalletizPageView.xaml | 447 ++++-------------- Aucma.Core.Palletiz/Views/PlanPageView.xaml | 89 ---- .../Views/PlanPageView.xaml.cs | 30 -- .../Views/QuantityIssuedView.xaml | 111 ----- .../Views/QuantityIssuedView.xaml.cs | 24 - .../Views/SearchCriteriaView.xaml | 107 ----- .../Views/SearchCriteriaView.xaml.cs | 17 - Aucma.Core.Palletiz/Views/SplitPlanView.xaml | 4 +- .../Views/StatisticsPageView.xaml | 44 +- Aucma.Core.PrintTo/Assets/Images/Icon.png | Bin 0 -> 1153 bytes .../Assets/Images/background.jpg | Bin 0 -> 111693 bytes Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj | 4 + .../ViewModels/MainWindowViewModel.cs | 71 ++- Aucma.Core.PrintTo/Views/IndexPageView.xaml | 42 +- Aucma.Core.PrintTo/Views/MainWindow.xaml | 69 +-- Aucma.Core.RunPlc/RunPlcService.cs | 4 +- .../Views/IndexPageView.xaml | 4 +- Aucma.Core.SheetMetal/Views/MainWindow.xaml | 1 - 25 files changed, 333 insertions(+), 877 deletions(-) delete mode 100644 Aucma.Core.Palletiz/Views/PlanPageView.xaml delete mode 100644 Aucma.Core.Palletiz/Views/PlanPageView.xaml.cs delete mode 100644 Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml delete mode 100644 Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml.cs delete mode 100644 Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml delete mode 100644 Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml.cs create mode 100644 Aucma.Core.PrintTo/Assets/Images/Icon.png create mode 100644 Aucma.Core.PrintTo/Assets/Images/background.jpg diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj index 7eee96de..9caaaa5b 100644 --- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj +++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj @@ -81,9 +81,6 @@ Code - - Code - Code diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user index 43c13b1d..00d9b561 100644 --- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user +++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user @@ -7,9 +7,6 @@ - - Designer - Designer @@ -19,12 +16,6 @@ Designer - - Designer - - - Designer - Designer diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs index 5537a641..59ca6381 100644 --- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs @@ -85,15 +85,16 @@ namespace Aucma.Core.Palletiz.ViewModels { ChartValues achievement = new ChartValues(); Random random = new Random(); - for (int i = 0; i < 2; i++) - { - achievement.Add(random.Next(1, 50)); - } + //for (int i = 0; i < 2; i++) + //{ + // achievement.Add(random.Next(1, 50)); + //} var column = new ColumnSeries(); column.DataLabels = true; column.Title = "小时产量"; column.Values = achievement; + column.ScalesYAt = 0; column.Foreground = Brushes.White; ModelStatistics.Add(column); @@ -109,13 +110,14 @@ namespace Aucma.Core.Palletiz.ViewModels ChartValues achievement2 = new ChartValues(); Random random2 = new Random(); - for (int i = 0; i < 5; i++) - { - achievement2.Add(random2.Next(0, 30)); - } + //for (int i = 0; i < 5; i++) + //{ + // achievement2.Add(random2.Next(0, 30)); + //} var column2 = new ColumnSeries(); column2.DataLabels = true; column2.Title = "型号统计"; + column2.ScalesYAt = 0; column2.Values = achievement2; column2.Foreground = Brushes.White; diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs index 10d4d689..fb555eb6 100644 --- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs @@ -11,6 +11,10 @@ using Admin.Core.Common; using Aucma.Core.PLc; using Aucma.Core.Scanner; using System.Linq; +using System.Windows.Threading; +using System.Threading.Tasks; +using Admin.Core.IService; +using Microsoft.Extensions.DependencyInjection; namespace Aucma.Core.Palletiz.ViewModels { @@ -20,10 +24,19 @@ namespace Aucma.Core.Palletiz.ViewModels private IndexPageView firstPage = new IndexPageView();//首页 private StatisticsPageView recordPage = new StatisticsPageView(); private PalletizPageView palletizPage = new PalletizPageView(); + + ISysUserInfoServices _sysUserInfoServices; public MainWindowViewModel() { + _sysUserInfoServices = App.ServiceProvider.GetService(); UserContent = firstPage; init(); + Task.Run(async () => + { + await RefreshTeamTime();//班组时间 + }); + + } public void init() @@ -34,6 +47,11 @@ namespace Aucma.Core.Palletiz.ViewModels timer.AutoReset = true; timer.Enabled = true; timer.Start(); + + DispatcherTimer timer2 = new DispatcherTimer(); + timer2.Interval = new TimeSpan(0, 0, 1); //间隔1秒 + timer2.Tick += new EventHandler(timer_Tick); + timer2.Start(); } #region 设备状态刷新 @@ -368,5 +386,51 @@ namespace Aucma.Core.Palletiz.ViewModels } #endregion + #region 刷新时间 + + public string _currentDateTime; + public string CurrentDateTime + { + get => _currentDateTime; + set => SetProperty(ref _currentDateTime, value); + } + #endregion + + #region 班组信息 + /// + /// 班组信息 + /// + public string _teamName; + public string TeamName + { + get => _teamName; + set => SetProperty(ref _teamName, value); + } + #endregion + + public async Task RefreshTeamTime() + { + while (true) + { + var list = await _sysUserInfoServices.GetTeamData(); + if (list != null && list.Count > 0) + { + var sysUserInfo = list.First(); + TeamName = $"{sysUserInfo.TeamName}({list.Min(d => d.StartTime).ToString("HH:mm")}~{list.Max(d => d.EndTime).ToString("HH:mm")})"; + //TeamName = $"{sysUserInfo.TeamName}"; + } + Thread.Sleep(5000); + } + } + + void timer_Tick(object sender, EventArgs e) + { + System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => + { + CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + })); + + } } } diff --git a/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs index d4cc2f4b..da9f4b2d 100644 --- a/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs @@ -273,12 +273,12 @@ namespace Aucma.Core.Palletiz.ViewModels [RelayCommand] public async Task SearchCriteriaSet() { - SearchCriteriaView searchCriteriaWindow = new SearchCriteriaView(); - bool? dialogResult = searchCriteriaWindow.ShowDialog(); - if (dialogResult == false) // 用户点击了“取消”按钮或关闭窗口 - { + //SearchCriteriaView searchCriteriaWindow = new SearchCriteriaView(); + //bool? dialogResult = searchCriteriaWindow.ShowDialog(); + //if (dialogResult == false) // 用户点击了“取消”按钮或关闭窗口 + //{ await LoadData(); - } + //} } #endregion @@ -324,9 +324,9 @@ namespace Aucma.Core.Palletiz.ViewModels var info = SelectedDataItem as ProductPlanInfoModel; if (info != null) { - info.PlanType = _radioButtonStatus; - QuantityIssuedView quantityIssuedWindow = new QuantityIssuedView(info, ObjId); - quantityIssuedWindow.ShowDialog(); + //info.PlanType = _radioButtonStatus; + //QuantityIssuedView quantityIssuedWindow = new QuantityIssuedView(info, ObjId); + //quantityIssuedWindow.ShowDialog(); } } diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml b/Aucma.Core.Palletiz/Views/IndexPageView.xaml index 09449a38..c8055788 100644 --- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml +++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml @@ -159,13 +159,6 @@ - @@ -202,7 +195,7 @@ - + @@ -225,7 +218,7 @@ - + @@ -233,7 +226,7 @@ - + diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml index 0be308b1..e2383798 100644 --- a/Aucma.Core.Palletiz/Views/MainWindow.xaml +++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml @@ -34,17 +34,16 @@ - - + - - - - - - - + + + + + + + + diff --git a/Aucma.Core.Palletiz/Views/PalletizPageView.xaml b/Aucma.Core.Palletiz/Views/PalletizPageView.xaml index c78d9da3..9c673f2f 100644 --- a/Aucma.Core.Palletiz/Views/PalletizPageView.xaml +++ b/Aucma.Core.Palletiz/Views/PalletizPageView.xaml @@ -6,366 +6,99 @@ xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views" mc:Ignorable="d" Background="#1152AC" d:DesignHeight="1080" d:DesignWidth="1920"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -