diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index c306f333..3cd79122 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -6061,6 +6061,11 @@ 创建时间 + + + 分舵获取成品下线所有类型 + + 工位信息 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 d14128d3..5173e3e6 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,26 +1,23 @@ { "format": 1, "restore": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -28,22 +25,22 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {}, + "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -52,11 +49,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -91,27 +83,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -119,16 +108,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -137,11 +125,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -289,27 +272,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -317,16 +297,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -335,11 +314,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -371,27 +345,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -399,52 +370,51 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj" + "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" } } } @@ -453,11 +423,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -485,27 +450,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -513,19 +475,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -534,11 +495,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -560,27 +516,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -588,19 +541,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -609,11 +561,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -635,27 +582,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -663,16 +607,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -681,11 +624,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -707,27 +645,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -735,16 +670,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -753,11 +687,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -779,27 +708,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -807,9 +733,8 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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": { @@ -821,11 +746,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -877,27 +797,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -905,22 +822,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -929,11 +845,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -955,27 +866,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj", "projectName": "Admin.Core.Socket", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\obj\\", + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -983,19 +891,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -1004,11 +911,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1044,27 +946,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1072,28 +971,27 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -1102,11 +1000,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1134,27 +1027,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1162,9 +1052,8 @@ "netstandard2.1" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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": { @@ -1176,11 +1065,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1208,27 +1092,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", "projectName": "Aucma.Core.PerfusionTask", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\obj\\", + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1236,22 +1117,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1260,11 +1140,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1286,27 +1161,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1314,9 +1186,8 @@ "netstandard2.1" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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": { @@ -1328,11 +1199,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1360,27 +1226,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1388,19 +1251,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1409,11 +1271,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1435,27 +1292,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1463,16 +1317,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1481,11 +1334,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1513,27 +1361,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1541,19 +1386,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1562,11 +1406,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1594,27 +1433,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", "projectName": "Aucma.Core.SheetMetalTasks", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\obj\\", + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1622,19 +1458,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1643,11 +1478,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1669,27 +1499,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1697,22 +1524,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1721,11 +1547,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1747,27 +1568,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", "projectName": "Aucma.Core.TemperatureTask", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\obj\\", + "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -1775,16 +1593,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "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.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -1793,11 +1610,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1819,7 +1631,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\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 58649efa..3652bdb0 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,22 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\ADMIN\.nuget\packages\;D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages PackageReference - 6.9.1 + 6.6.0 - - - - + + - C:\Users\Lenovo\.nuget\packages\touchsocket.core\2.0.0 - C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\ADMIN\.nuget\packages\touchsocket.core\2.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.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index 57e5b0bb..4043b923 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ac6266f5a5b3389d62c713916526556c063db9b")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index 70ae7a7e..58c698aa 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -995a0e183e4d26b7714e590bc674bf1598e73e09f8aeb5aab829b84e2ab593e0 +6608f80269768d5f9f4b079b5eb86bb2aed1cd2aa7194f894eeec6c70841fa38 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 60b6cf63..6c5e02be 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,11 +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.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\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 = E:\c#\AUCMA\new\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 f43e60d7..3cfa2f5f 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index 89ecd636..c8370bf1 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -7170,11 +7170,12 @@ ] }, "System.Collections.NonGeneric/4.3.0": { - "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==", + "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", "type": "package", "path": "system.collections.nongeneric/4.3.0", "files": [ ".nupkg.metadata", + ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -9907,11 +9908,12 @@ ] }, "System.Runtime.Serialization.Primitives/4.3.0": { - "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==", + "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", "type": "package", "path": "system.runtime.serialization.primitives/4.3.0", "files": [ ".nupkg.metadata", + ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -11487,28 +11489,23 @@ ] }, "packageFolders": { - "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, - "D:\\开发环境\\DevExpress\\Components\\Offline Packages": {}, - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\ADMIN\\.nuget\\packages\\": {}, + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\c#\\AUCMA\\new\\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": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", + "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\ADMIN\\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" ], @@ -11516,22 +11513,22 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {}, + "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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\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" + "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -11540,11 +11537,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -11579,7 +11571,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index 98ce8b8f..8ebc06cc 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,236 +1,236 @@ { "version": 2, - "dgSpecHash": "x1SJPkfgPOwX87+jGbmfVAlm3GQ3PS7NkQ0MIPnrDP1KJlVgkYM207ypxoNFNwZrdNzBfROB2/PWP2lACikOMA==", + "dgSpecHash": "bbwFP5UR7DH6007kWBqdCEnSEMxI5ppX8XjGi0doQvdUrFXMvUj+YuL+nyQFBGrrjAK5W7qqw4pW3XcEXiAM2g==", "success": true, - "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectFilePath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ - "C:\\Users\\Lenovo\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.speech\\7.0.0\\system.speech.7.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\touchsocket\\2.0.0\\touchsocket.2.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\touchsocket.core\\2.0.0\\touchsocket.core.2.0.0.nupkg.sha512", - "C:\\Users\\Lenovo\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512" + "C:\\Users\\ADMIN\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.speech\\7.0.0\\system.speech.7.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\touchsocket\\2.0.0\\touchsocket.2.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\touchsocket.core\\2.0.0\\touchsocket.core.2.0.0.nupkg.sha512", + "C:\\Users\\ADMIN\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index b621775c..91fb2074 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index d795aada..977dfe5b 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 46c74bdf2480bff185fcd121ec7cb38d60038ffc9c6d12d74337261a568828ce +======= +3c08b2a6f95957043123cba0d01dcd1675663fc7 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index e37f6034..e43b7078 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Common\ diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index e35da4eb..fcd8054e 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 1787b07c..116e335b 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 4ea047f08316e91bed4a7bfa28790e4a2cec06376c3d4ccc8ac46cad74f36cfa +======= +2af60005099f8dd0481f84ac0dfadb89cc4b6f1d +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index bf1e4ba3..987e6af9 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.EventBus\ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index e4db5522..93109f44 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index a057cf91..e1c9b3c1 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 4beb33250e0f70d033fcab9bba694ecf77320b831f3ce847878c93862915af6e +======= +790ffd47e6e46a3c8a83558ad3550154a5c81377 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig index 9ff4dd0c..75d65c67 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Extensions\ diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index a018dc9c..1878a1a1 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index 0dea309b..6ca2ac0f 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 006c85e2f6346d3768a5436c2a837ef449e68c0a41706c4a3d7aa5b46d778a99 +======= +7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig index d158aae3..78bd9222 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig @@ -1,5 +1,9 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\ +<<<<<<< HEAD +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 4d9bfa35..63083466 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 4c3902cc..19f95980 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 45addee8850bceee5bd10a497cf8557a22350b61fccf5d7e68772e96ff247392 +======= +80bb097f76aa594dc58289065a284d1acbd8bdff +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index 8e921e97..7d227ef6 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IRepository\ diff --git a/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs b/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs index 33a1e28f..b67c92ae 100644 --- a/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs +++ b/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs @@ -19,5 +19,8 @@ namespace Admin.Core.IService /// /// Task UpdatePrintName(BaseOrderInfo printName); + + + } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs b/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs index 9918bcf0..c73cf740 100644 --- a/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs +++ b/Admin.Core.IService/IService_New/ICodeBindingRecordServices.cs @@ -34,5 +34,13 @@ namespace Admin.Core.IService /// /// Task> QueryByTime(); + + /// + /// 查询所有成品型号 + /// + /// + /// + public List GetAllProductModel(); + } } \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IProductOffLineServices.cs b/Admin.Core.IService/IService_New/IProductOffLineServices.cs index 1eca7ed7..ef87e675 100644 --- a/Admin.Core.IService/IService_New/IProductOffLineServices.cs +++ b/Admin.Core.IService/IService_New/IProductOffLineServices.cs @@ -1,6 +1,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -14,6 +15,10 @@ namespace Admin.Core.IService public interface IProductOffLineServices : IBaseServices { + + + + /// /// 条码系统获取校验字符串 /// diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index c432a8bd..f39909d5 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index 00111e8a..9c7f400c 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 359bc4838b66bd6acc960b7940d460416823313184a69faaa379966f1a45a03b +======= +51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index ddd2b80b..7ccb1e1e 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IService\ diff --git a/Admin.Core.Model/Model_New/PrintSuppleMentBarCode.cs b/Admin.Core.Model/Model_New/PrintSuppleMentBarCode.cs index 871b561a..c2f2e370 100644 --- a/Admin.Core.Model/Model_New/PrintSuppleMentBarCode.cs +++ b/Admin.Core.Model/Model_New/PrintSuppleMentBarCode.cs @@ -58,7 +58,7 @@ namespace Admin.Core.Model /// 是否打印 1=>打印 /// [SugarColumn(ColumnName = "IS_PRINT")] - public int IsPrint { get; set; } + public string IsPrint { get; set; } } } diff --git a/Admin.Core.Model/ViewModels/ProductAllModel.cs b/Admin.Core.Model/ViewModels/ProductAllModel.cs new file mode 100644 index 00000000..efcf1648 --- /dev/null +++ b/Admin.Core.Model/ViewModels/ProductAllModel.cs @@ -0,0 +1,25 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.ViewModels +{ + /// + /// 分舵获取成品下线所有类型 + /// + [SugarTable("GET_OFFLINE_ALL_MODEL", "AUCMA_SCADA")] + public class ProductAllModel + { + [SugarColumn(ColumnName = "PRODUCT_CODE")] + public string ProductCode { get; set; } + [SugarColumn(ColumnName = "PRODUCT_NAME")] + public string ProductName { get; set; } + [SugarColumn(ColumnName = "PRODUCT_MODEL")] + public string ProductModel { get; set; } + [SugarColumn(ColumnName = "PRODUCT_MASTER_MODEL")] + public string ProductMasterModel { get; set; } + } +} diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 3605822a..9980d38a 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ac6266f5a5b3389d62c713916526556c063db9b")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index 61f5747d..bbe9abe1 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -8a7dd466dc08777c934806f3b9fbd0391e7ac998f9b3fc1f23423e763c7f3959 +f6af4f2983ca7fe495be456901efbe746435add2d0f2f6f533cdda5e1fdf8b31 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 4bea6c27..0b5bdcb9 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,6 +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.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Model\ diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index fd710e45..24907b61 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index 81b2ea09..85dca559 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD f6b00de97539aff6e53cbd3c6252ed46f038e0c2f5d2f1f9c61607b34c899092 +======= +0868e6bde5b49a65a126b91d794e990427a11761 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b 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 a5e40532..eba502bd 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,6 +8,10 @@ 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\ +<<<<<<< HEAD +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48 diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index b977d248..8246c17b 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index 9c04c1d5..b241eb8f 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 664c217c277ce07ac70e2d81733564bcbc70269dbeb5740dbdfb8d1a570d0786 +======= +046606c52f7e20e88e6dd5ffc01e33664c4b9ff8 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b 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 8f3ae2b8..567ae76f 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,6 +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.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Repository\ diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index b334aa40..8a1d4398 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 68d4f2f6..0f15a468 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD f59d1862e375e8e54ad9e5218f27b988b8b239823671ce855cdb7fad9304ea07 +======= +dbec6c73777a8ebf7006f00f1928199755951ac1 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index 614f9a4b..a8331c60 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Serilog.Es\ diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index a2425b0f..946e7f94 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -162,6 +162,7 @@ namespace Admin.Core.Service return _baseOrderInfoRepository.UpdatePrintName(printName); } + } } diff --git a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs index 9d3496ae..9da2c907 100644 --- a/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs +++ b/Admin.Core.Service/Service_New/CodeBindingRecordServices.cs @@ -109,6 +109,21 @@ namespace Admin.Core.Service return await _codeBindingRecordRepository.QueryAsync(x => x.ProductCode == null, "RECORD_TIME1 DESC"); } - + + /// + /// 查询所有成品型号 + /// + /// + /// + public List GetAllProductModel() + { + var _db = this.BaseDal.Db; + + List list = _db.Ado.SqlQuery("select * from C##AUCMA_SCADA.GET_OFFLINE_ALL_MODEL"); + + return list; + } + + } } diff --git a/Admin.Core.Service/Service_New/ProductOffLineServices.cs b/Admin.Core.Service/Service_New/ProductOffLineServices.cs index cabcee38..8ef43b6b 100644 --- a/Admin.Core.Service/Service_New/ProductOffLineServices.cs +++ b/Admin.Core.Service/Service_New/ProductOffLineServices.cs @@ -106,7 +106,15 @@ namespace Admin.Core.Service try { - productOffline = _rep.Query(x => x.ProductSncode == snCode).First(); + if (snCode.Length < 20) + { //手动入库传的SN是产品型号,选取该型号最新一条记录 + productOffline = _rep.FirstAsync(x => x.ProductCode == snCode).Result; + } + else + { + productOffline = _rep.Query(x => x.ProductSncode == snCode).First(); + } + } catch (Exception e) { diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 16ba852e..1e8397bf 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index bb579a33..e912d64f 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 1701bfa6f5611d7194cf44ff09851cfb25f4fc63abb93fcc29e110dba6ecee15 +======= +ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b 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 7659a045..ade53e61 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,6 +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.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Service\ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 68fe1837..95c7214c 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< HEAD [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index e51ba1b4..7c09e26e 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD 151b14434a80c2311224726e426eb1413901a0dd483fcfffbda057ea1c38c118 +======= +da4240456d30e56fa6c5e71babf5565adb3e1436 +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b 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 9a880b7c..aa57dd8c 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,6 +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.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\ diff --git a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs index 04d485dd..bf530f85 100644 --- a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Timers; @@ -156,6 +157,9 @@ namespace Aucma.Core.BoxFoam.Business if (obj1.plc.IsConnected) { var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空 + Thread.Sleep(500); + obj1.plc.WriteBool("M6.0", false);//数据清空后复位 + Console.WriteLine($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); } } @@ -165,6 +169,9 @@ namespace Aucma.Core.BoxFoam.Business if (obj2.plc.IsConnected) { bool flag = obj2.plc.WriteBool("M6.0", true);//换班 数据清空 + Thread.Sleep(500); + obj2.plc.WriteBool("M6.0", false);//数据清空后复位 + Console.WriteLine($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); } } diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index fa69b91d..6cb37907 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -47,7 +47,7 @@ namespace Aucma.Core.BoxFoam.ViewModels await init(); await RefreshTeamTime();//班组时间 }); - + TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness(); teamSwitchBusiness.Init();//切换班组清空发泡产量 //实时更新界面时间 @@ -489,8 +489,62 @@ namespace Aucma.Core.BoxFoam.ViewModels { System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => { - CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - + DateTime now = DateTime.Now; + CurrentDateTime = now.ToString("yyyy-MM-dd HH:mm:ss"); + DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00); + string date = scheduledTime.ToString(); + if (CurrentDateTime== date) + { + var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); + if (obj1 != null) + { + if (obj1.plc.IsConnected) + { + var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空 + Thread.Sleep(500); + obj1.plc.WriteBool("M6.0", false);//换班 数据清空 + log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); + } + } + var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc")); + if (obj2 != null) + { + if (obj2.plc.IsConnected) + { + bool flag = obj2.plc.WriteBool("M6.0", true);//换班 数据清空 + Thread.Sleep(500); + obj2.plc.WriteBool("M6.0", false);//换班 数据清空 + log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); + } + } + } + DateTime scheduledTime2 = new DateTime(now.Year, now.Month, now.Day, 8, 00, 00); + string date2 = scheduledTime2.ToString(); + if (CurrentDateTime == date2) + { + var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); + if (obj1 != null) + { + if (obj1.plc.IsConnected) + { + var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空 + Thread.Sleep(500); + obj1.plc.WriteBool("M6.0", false);//换班 数据清空 + log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); + } + } + var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc")); + if (obj2 != null) + { + if (obj2.plc.IsConnected) + { + bool flag = obj2.plc.WriteBool("M6.0", true);//换班 数据清空 + Thread.Sleep(500); + obj2.plc.WriteBool("M6.0", false);//换班 数据清空 + log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); + } + } + } })); } diff --git a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs index b9785db7..77a6bbac 100644 --- a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs @@ -51,7 +51,7 @@ namespace Aucma.Core.CodeBinding.ViewModels private readonly ICodeBindingRecordServices? _codeBindingRecordServices; private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices; private readonly IBaseBomInfoServices? _baseBomInfoServices; - + private readonly IPrintBarCodeServices? _printBarCodeServices; // 过点数据表，物料完成记录MaterialCompletion private readonly IMaterialCompletionServices? _iMaterialCompletionServices; diff --git a/Aucma.Core.DataCollector/Factory/Class1.cs b/Aucma.Core.DataCollector/Factory/Class1.cs new file mode 100644 index 00000000..1b5c4494 --- /dev/null +++ b/Aucma.Core.DataCollector/Factory/Class1.cs @@ -0,0 +1,27 @@ +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.DataCollector.Factory +{ + internal class Class1 : DataCollectorFactory + { + public Class1(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) + { + } + + public override void CollectDeviceAlarmInfo(out List deviceAlarmInfos) + { + throw new NotImplementedException(); + } + + public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity) + { + throw new NotImplementedException(); + } + } +} diff --git a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs index b813f9d9..801ad970 100644 --- a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs +++ b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs @@ -97,7 +97,11 @@ namespace Aucma.Core.DataCollector.Factory Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备用电数据"); var plc = _plc.plc; +<<<<<<< HEAD deviceElectricitys = new List(); +======= + var info = plc.Read("D7602", 40); +>>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" }; diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user index 47af9b68..7e4433aa 100644 --- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user +++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user @@ -6,6 +6,11 @@ Designer + + + Code + + Designer @@ -25,6 +30,9 @@ Designer + + Designer + Designer diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs index 017a2ff7..9ceea115 100644 --- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs +++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs @@ -1,4 +1,5 @@ -using Admin.Core.Common.Helper; +using Admin.Core.Common; +using Admin.Core.Common.Helper; using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; @@ -6,10 +7,12 @@ using Admin.Core.Service; using Admin.Core.Socket; using Aucma.Core.HwPLc; using Aucma.Core.Palletiz.config; +using Aucma.Core.Palletiz.Models; using Aucma.Core.Palletiz.ViewModels; using log4net; using Microsoft.Extensions.DependencyInjection; using NPOI.SS.Formula.UDF; +using NPOI.SS.Util; using System; using System.Collections.Generic; using System.Linq; @@ -31,6 +34,12 @@ namespace Aucma.Core.Palletiz.Business private readonly AppConfig _appConfig; + private AppConfig appConfig = new AppConfig(); + + public string storeCode = Appsettings.app("StoreInfo", "PalletizStoreCodeA"); + + + private readonly IRecordInStoreServices? _recordInstoreServices = App.ServiceProvider.GetService(); #region 委托事件 /// @@ -59,6 +68,7 @@ namespace Aucma.Core.Palletiz.Business _appConfig = new AppConfig(); _spaceinfoService = App.ServiceProvider.GetService(); _offlineService = App.ServiceProvider.GetService(); + HandPalletizViewModel.HandSendEvent += InStore; // string AA = ExtractNumber("FD01_012"); } @@ -106,9 +116,10 @@ namespace Aucma.Core.Palletiz.Business /// 入库申请 /// /// 货道区域 - /// + /// 20位是正常扫码传输的条码,手动入库传的是人工选择的成品型号 private void InStore(string spaceArea, string asciiStr) { + RecordInStore recordInstore = new RecordInStore(); String msg = string.Empty; try { @@ -122,15 +133,7 @@ namespace Aucma.Core.Palletiz.Business throw new ArgumentException($"入库申请处理异常:货道区域为空"); } - //if (asciiStr.Contains(";") && asciiStr.Length == BarcodeRef.Length) - //{ - // string[] splitStr = asciiStr.Split(";"); - // if (splitStr.Length > 1) - // { - // asciiStr = splitStr[1]; - // } - //} - + _offlineService.GetProductInfosBySnCode(asciiStr, out ProductOffline prodInfo); @@ -140,20 +143,51 @@ namespace Aucma.Core.Palletiz.Business } RefreshProductInfoEvent?.Invoke(asciiStr,prodInfo.ProductModel,prodInfo.ProductOrderNo); + GetSpaceInfoByMaterialType(spaceArea, prodInfo, out BaseSpaceInfo laseSpaceinfo, out BaseSpaceInfo spaceinfo); + + + bool result = false; - SendInStoreTask(asciiStr,spaceinfo, ref result,Convert.ToInt32(prodInfo.ProductMasterModel),ref msg); + SendInStoreTask(asciiStr,spaceinfo, ref result,Convert.ToInt32(prodInfo.ProductMasterModel),ref msg,out int range); - if (!result) + #region 添加入库记录 + + recordInstore.StoreCode = storeCode; + recordInstore.StoreArea = spaceArea; + recordInstore.SpaceCode = spaceinfo.SpaceCode; + recordInstore.MaterialType = spaceinfo.MaterialType; + recordInstore.MaterialCode = spaceinfo.MaterialType; + recordInstore.InStoreTime = DateTime.Now; + recordInstore.BarCodeCode = asciiStr; + recordInstore.MaterialName = prodInfo.ProductName; + recordInstore.InStoreAmount = range ; + + recordInstore.IsFlag = 0; + recordInstore.CreatedTime = DateTime.Now; + if (asciiStr.Length < 20) + { + recordInstore.EntryPattern = 1; + } + else { + recordInstore.EntryPattern = 0; + } + + _ = _recordInstoreServices.AddAsync(recordInstore).Result; + #endregion + + if (!result) + { msg = msg + "放行失败"; RefreshMsgEvent?.Invoke(msg); throw new ArgumentException($"入库申请处理异常:入库任务下发至PLC失败"); } else { + msg = msg + "放行成功"; RefreshMsgEvent?.Invoke(msg); List spaceinfos = new List(); @@ -166,14 +200,18 @@ namespace Aucma.Core.Palletiz.Business spaceinfos.Add(spaceinfo); _spaceinfoService.UpdateSpaceInfo(spaceinfos); } + } catch (Exception e) { msg =$"入库逻辑处理异常:{e.Message}"; RefreshMsgEvent?.Invoke(msg); } + } + + /// /// 通过物料型号获取货道信息 /// @@ -289,8 +327,10 @@ namespace Aucma.Core.Palletiz.Business /// /// /// - private void SendInStoreTask(string asciiStr, BaseSpaceInfo spaceinfo, ref bool result,int prodWeight,ref string msg) + private void SendInStoreTask(string asciiStr, BaseSpaceInfo spaceinfo, ref bool result,int prodWeight,ref string msg,out int rangeResult) { + int spinFlag = -1; + rangeResult = 0; if (plcCon == null) { throw new ArgumentException($"下发入库任务至PLC逻辑异常:Plc连接为空"); @@ -301,27 +341,24 @@ namespace Aucma.Core.Palletiz.Business bool isFlag = true; int spaceCode = StringChange.ParseToInt(spaceinfo.SpaceCode); - int spinFlag = 3; // 转180度发1，不转发3 - if (prodWeight < 140) + spinFlag =JudgeRotation(spaceCode, prodWeight, out int ranges); + rangeResult = ranges; + if (spinFlag == -1) { - if (spaceCode % 2 != 0) //偶数 转180° - { - spinFlag = 1; //4 - } - } - else if (prodWeight >= 140) - { - if (spaceCode % 2 == 0) //偶数 转180° - { - spinFlag = 1; //4 - } + msg = $"成品码:{asciiStr},仓库区域:{spaceinfo.SpaceArea},匹配货道:{spaceinfo.SpaceCode}；旋转角度匹配失败，请先设置该型号旋转规则!"; + RefreshMsgEvent?.Invoke(msg); + return; } - msg = $"成品码:{asciiStr},仓库区域:{spaceinfo.SpaceArea},匹配货道:{spaceinfo.SpaceCode}；旋转：{(spinFlag == 3 ? "0°" : "180°")};下发plc放行信号"; RefreshMsgEvent?.Invoke(msg); - + DateTime startTime = DateTime.Now; while (isFlag) { + if((DateTime.Now - startTime).TotalSeconds > 15) + { + result = false; + return; + } bool answerFlag = _plc.ReadBool("B1000"); if (answerFlag) @@ -329,7 +366,8 @@ namespace Aucma.Core.Palletiz.Business isFlag = false; } - Task.Delay(1000 * 2).Wait(); + + Task.Delay(500).Wait(); } if (spaceinfo.SpaceArea == "A") @@ -354,7 +392,53 @@ namespace Aucma.Core.Palletiz.Business } } + /// + /// 根据货物容积确定旋转规则 转180度发1，不转发3 + /// + /// + /// + public int JudgeRotation(int spaceCode,int prodWeight, out int ranges) + { + try + { + List list = appConfig.GetJumpRanges(); + foreach (JumpRange range in list) + { + if (range.MinModel <= prodWeight && range.MaxModel > prodWeight) // 找到该型号规则 + { + if (spaceCode % 2 == 0) // 偶数货道 + { + ranges = range.EvenSpaceRange; + return RangeToInt(range.EvenSpaceRange); + } + else + { + ranges = range.OddSpaceRange; + return RangeToInt(range.OddSpaceRange); + } + } + } + } + catch (Exception ex) + { + Console.WriteLine("JudgeRotation"+ex.Message); + } + ranges = 0; + return -1; + } + public int RangeToInt(int range) + { + int result = -1; + switch (range) { + case 0: result = 3; break; + case 90: result = 1; break; + case 180: result = 4; break; + case 270: result = 2; break; + } + + return result; + } /// /// 提取货道号 /// diff --git a/Aucma.Core.Palletiz/Common/SpeechStr.cs b/Aucma.Core.Palletiz/Common/SpeechStr.cs new file mode 100644 index 00000000..37e9f865 --- /dev/null +++ b/Aucma.Core.Palletiz/Common/SpeechStr.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Speech.Synthesis; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.Palletiz.Common +{ + public class SpeechStr + { + private static readonly Lazy lazy = new Lazy(() => new SpeechStr()); + + public static SpeechStr Instance { + get + { + return lazy.Value; + } + } + + public void speech(string str) { + + SpeechSynthesizer speech = new SpeechSynthesizer(); + speech.Rate = 3;//设置语速 + speech.Volume = 100;//设置音量 + speech.SelectVoice("Microsoft Huihui Desktop");//设置播音员（中文） + speech.SpeakAsync(str); + + } + + + } + + + +} diff --git a/Aucma.Core.Palletiz/ConvertTo/StringToIntConverter .cs b/Aucma.Core.Palletiz/ConvertTo/StringToIntConverter .cs new file mode 100644 index 00000000..526554a5 --- /dev/null +++ b/Aucma.Core.Palletiz/ConvertTo/StringToIntConverter .cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; + +namespace Aucma.Core.Palletiz.ConvertTo +{ + public class StringToIntConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return value?.ToString(); // 将整数转换为字符串 + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + int result; + if (int.TryParse(value?.ToString()?.Split(':')[1]?.Trim(), out result)) + { + return result; // 将字符串转换为整数 + } + return DependencyProperty.UnsetValue; + } + } +} diff --git a/Aucma.Core.Palletiz/Models/JumpRange.cs b/Aucma.Core.Palletiz/Models/JumpRange.cs new file mode 100644 index 00000000..23f65a85 --- /dev/null +++ b/Aucma.Core.Palletiz/Models/JumpRange.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.Palletiz.Models +{ + /// + /// 配置文件旋转角度规则--对象 + /// + public class JumpRange + { + + public int ObjId { get; set; } + + /// + /// 最小型号 + /// + public int MinModel { get; set; } + /// + /// 最大型号 + /// + public int MaxModel { get; set; } + /// + /// 奇数货道旋转角度 + /// + public int OddSpaceRange { get; set; } + /// + /// 偶数货道旋转角度 + /// + public int EvenSpaceRange { get; set; } + + } +} diff --git a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs index a5cea95f..62d302f7 100644 --- a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs @@ -1,16 +1,19 @@ using Admin.Core.IService; using Admin.Core.Model; +using Admin.Core.Model.ViewModels; using Admin.Core.Service; using Aucma.Core.Palletiz.Business; using Aucma.Core.Palletiz.Models; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using Elasticsearch.Net.Specification.MachineLearningApi; using log4net; using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; -using System.Windows.Forms; +using System.Windows; namespace Aucma.Core.Palletiz.ViewModels { @@ -18,115 +21,143 @@ namespace Aucma.Core.Palletiz.ViewModels { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(HandPalletizViewModel)); public static StackInfoModel tempStackInfo = new StackInfoModel(); - private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; + private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; private readonly IRecordInStoreServices _recordInstoreServices; + private readonly ICodeBindingRecordServices? _codeBindingRecordServices; + + /// + /// 手动入库委托 + /// + public delegate void HandSend(string spaceArea, string asciiStr); + public static event HandSend? HandSendEvent; + + + public HandPalletizViewModel() { - _baseSpaceInfoServices = App.ServiceProvider.GetService(); - _recordInstoreServices = App.ServiceProvider.GetService(); - Range = 1; - SpaceNo ="001"; - PromptInfo("请选择信息下传......", "White"); + + _codeBindingRecordServices = App.ServiceProvider.GetService(); + init(); } - #region 分垛信息下传 - /// - /// 分垛信息下传 - /// - [RelayCommand] - public void Save() + public void init() { - try + List list = _codeBindingRecordServices.GetAllProductModel(); + if (list == null || list.Count == 0) return; + list = list.OrderBy(x => x.ProductMasterModel).ToList(); + MaterialDataGrid.Clear(); + Application.Current.Dispatcher.Invoke(() => { - - DialogResult cr = MessageBox.Show("是否确认下传分垛信息?", "系统提醒", MessageBoxButtons.OKCancel); - if (cr != DialogResult.OK) + foreach (ProductAllModel info in list) { - return; + MaterialDataGrid.Add(info); } - PromptInfo("分垛信息下传中......", "White"); + }); + } - int range = Range; - int spaceNo =Convert.ToInt32(SpaceNo); - if (spaceNo==0) - { - MessageBox.Show("请选择目的货道！","系统提醒"); - return; - } - string hh = "FD01_" + SpaceNo; - Admin.Core.Model.BaseSpaceInfo spaceInfo = _baseSpaceInfoServices.FirstAsync(X => X.StoreCode.Contains("FD") && X.SpaceCode == "FD01_"+SpaceNo).Result; - if (spaceInfo == null) - { - MessageBox.Show("货道未创建！", "系统提醒"); - return; - } - - } - catch (Exception ex) + + #region 鼠标双击事件 + /// + /// 鼠标双击事件 + /// + /// + public void MouseClick(object obj) + { + + var info = SelectedDataItem; + if (info != null) { - PromptInfo($"分垛信息下传失败:{ex.Message}", "Red"); + ProductCode = info.ProductCode; + ProductModel = info.ProductModel; } } - #endregion - #region 提示信息 + #endregion - private string? msgTxt; - public string? MsgTxt + #region 初始化下拉列表 + /// + /// 初始化下拉列表 + /// + private ProductAllModel selectedDataItem; + public ProductAllModel SelectedDataItem { - get => msgTxt; - set => SetProperty(ref msgTxt, value); + get { return selectedDataItem; } + set => SetProperty(ref selectedDataItem, value); + } #endregion - #region 字体颜色 - private string? msgColor; + #region 分垛信息下传 + /// + /// 分垛信息下传 + /// + [RelayCommand] + public void Save(Window window) + { + if (string.IsNullOrEmpty(ProductCode)) + { + MessageBox.Show("请先选择产品型号"); + return; + } + + HandSendEvent?.Invoke("A", productCode); + MessageBox.Show("手动入库成功"); + window.Close(); + // 入库 + + } - public string? MsgColor + + /// + /// 分垛信息下传 + /// + [RelayCommand] + public void Cancel(Window window) { - get => msgColor; - set => SetProperty(ref msgColor, value); + window.Close(); + } #endregion - #region 提示信息 + + #region 初始化datagrid产品信息 /// - /// 提示信息 + /// 初始化物料信息 /// - /// 提示信息 - /// 提示信息颜色 - public void PromptInfo(string mesg, string color) + private ObservableCollection materialDataGrid = new ObservableCollection(); + + public ObservableCollection MaterialDataGrid { - System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => - { - MsgTxt = mesg; - MsgColor = color; - })); + get { return materialDataGrid; } + set => SetProperty(ref materialDataGrid, value); } #endregion - #region 目的货道 - private string spaceNo; + #region 选中条码 + private string productCode; - public string SpaceNo + public string ProductCode { - get => spaceNo; - set => SetProperty(ref spaceNo, value); + get => productCode; + set => SetProperty(ref productCode, value); } #endregion - #region 方向 - private int range; - public int Range + #region 选中型号 + private string productModel; + + public string ProductModel { - get => range; - set => SetProperty(ref range, value); + get => productModel; + set => SetProperty(ref productModel, value); } #endregion + + } } diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs index 72da57ea..4cc3b284 100644 --- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs @@ -138,6 +138,8 @@ namespace Aucma.Core.Palletiz.ViewModels private ObservableCollection spaceItems = new ObservableCollection(); + private ObservableCollection spaceItemsB = new ObservableCollection(); + /// /// 刷新界面提示信息 @@ -163,42 +165,43 @@ namespace Aucma.Core.Palletiz.ViewModels private void Init() { - - App.Current.Dispatcher.BeginInvoke((Action)(() => + var info = inStoreBusiness.GetBaseSpaceinfos("A"); + info = info.OrderByDescending(x => x.ObjId).ToList(); + if (info != null) { - var info = inStoreBusiness.GetBaseSpaceinfos("A"); - if (info != null) + App.Current.Dispatcher.BeginInvoke((Action)(() => { if (spaceItems.Count > 0) { spaceItems.Clear(); } - - info = info.OrderBy(x => x.ObjId).ToList(); foreach (var item in info) { spaceItems.Add(item); } AreaA_SpaceInfo = spaceItems; - } - })); - App.Current.Dispatcher.BeginInvoke((Action)(() => + })); + } + + + var info2 = inStoreBusiness.GetBaseSpaceinfos("A"); + info2 = info2.OrderBy(x => x.ObjId).ToList(); + if (info2 != null) { - var info = inStoreBusiness.GetBaseSpaceinfos("A"); - if (info != null) + App.Current.Dispatcher.BeginInvoke((Action)(() => { - if (spaceItems.Count > 0) + if (spaceItemsB.Count > 0) { - spaceItems.Clear(); + spaceItemsB.Clear(); } - info = info.OrderBy(x => x.ObjId).ToList(); - foreach (var item in info) + foreach (var item in info2) { - spaceItems.Add(item); + spaceItemsB.Add(item); } - AreaB_SpaceInfo = spaceItems; - } - })); + AreaB_SpaceInfo = spaceItemsB; + })); + } + } } } diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs index 479c6f71..434acf02 100644 --- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs @@ -16,6 +16,7 @@ using Admin.Core.IService; using Microsoft.Extensions.DependencyInjection; using Aucma.Core.Palletiz.Business; using Aucma.Core.HwPLc; +using Aucma.Core.Palletiz.Common; namespace Aucma.Core.Palletiz.ViewModels { @@ -25,7 +26,7 @@ namespace Aucma.Core.Palletiz.ViewModels private IndexPageView firstPage = new IndexPageView();//首页 private StatisticsPageView recordPage = new StatisticsPageView(); private PalletizPageView palletizPage = new PalletizPageView(); - + private SpeechStr speech = SpeechStr.Instance; ISysUserInfoServices _sysUserInfoServices; public MainWindowViewModel() { @@ -39,7 +40,8 @@ namespace Aucma.Core.Palletiz.ViewModels //测试开启 //InstoreBusiness instore=new InstoreBusiness(); //instore.test(); - + + } public void init() @@ -88,7 +90,7 @@ namespace Aucma.Core.Palletiz.ViewModels /// public void RefreshPlc() { - var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("分垛库Plc")); + var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("InStoreAPlc")); if (obj != null) { if (obj.plc.IsConnected) diff --git a/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs b/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs index 1a8240eb..d4257d3c 100644 --- a/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs @@ -2,6 +2,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; using Admin.Core.Service; using Aucma.Core.Palletiz.Common; using Aucma.Core.Palletiz.Views; @@ -10,7 +11,9 @@ using CommunityToolkit.Mvvm.Input; using log4net; using Microsoft.Extensions.DependencyInjection; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; @@ -37,6 +40,8 @@ namespace Aucma.Core.Palletiz.ViewModels private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices; private readonly IBaseOrderInfoServices? _baseOrderInfoServices; private readonly IBaseSpaceInfoServices _baseSpaceInfoServices; + private readonly ICodeBindingRecordServices? _codeBindingRecordServices; + private readonly IProductOffLineServices _offlineService; private string spaceCodes = string.Empty; private AppConfigHelper appConfig = new AppConfigHelper(); @@ -45,7 +50,13 @@ namespace Aucma.Core.Palletiz.ViewModels { _baseSpaceInfoServices = App.ServiceProvider.GetService(); _baseOrderInfoServices = App.ServiceProvider.GetService(); + _codeBindingRecordServices = App.ServiceProvider.GetService(); + _offlineService = App.ServiceProvider.GetService(); //_baseMaterialInfoServices = App.ServiceProvider.GetService(); + if (space == null) + { + SpaceInfo = new BaseSpaceInfo(); + } SpaceInfo = space; SearchCriteriaViewModel.RefreshConfigDelegateEvent += SaveSearchCriteria; @@ -71,11 +82,17 @@ namespace Aucma.Core.Palletiz.ViewModels string station = Appsettings.app("StationInfo", "StationCode"); if (!string.IsNullOrEmpty(selectedOption)) { - var infos = await _baseOrderInfoServices.QueryAsync(x => x.MaterialName.Contains(selectedOption)); + List list = _codeBindingRecordServices.GetAllProductModel(); + if (list != null) + { + list = list.Where(x=>x.ProductName.Contains(selectedOption)).ToList(); + if (list == null || list.Count==0) return; + } + // var infos = await _baseOrderInfoServices.QueryAsync(x => x.MaterialName.Contains(selectedOption)); MaterialDataGrid.Clear(); Application.Current.Dispatcher.Invoke(() => { - foreach (BaseOrderInfo info in infos) + foreach (ProductAllModel info in list) { MaterialDataGrid.Add(info); } @@ -110,15 +127,18 @@ namespace Aucma.Core.Palletiz.ViewModels //初始化加载数据 public async void Load(BaseSpaceInfo space) { - var infos = await _baseOrderInfoServices.QueryAsync(d=>d.CompleteAmount!=d.OrderAmount); + List list = _codeBindingRecordServices.GetAllProductModel(); + if(list==null || list.Count==0) return; + list = list.OrderBy(x=>x.ProductMasterModel).ToList(); + // var infos = await _baseOrderInfoServices.QueryAsync(d=>d.CompleteAmount!=d.OrderAmount); MaterialDataGrid.Clear(); Application.Current.Dispatcher.Invoke(() => { - foreach (BaseOrderInfo info in infos) + foreach (ProductAllModel info in list) { MaterialDataGrid.Add(info); } - }); + }); // 加载页面单选框和下拉框 if (space != null) { @@ -131,8 +151,8 @@ namespace Aucma.Core.Palletiz.ViewModels IsSelectedOptionB = true; } - planInfo.MaterialCode = space.MaterialType; - planInfo.MaterialName = space.typeNameA; + planInfo.ProductCode = space.MaterialType; + planInfo.ProductModel = space.typeNameA; if (SelectedRotation == null) { @@ -148,9 +168,9 @@ namespace Aucma.Core.Palletiz.ViewModels /// /// 初始化物料信息 /// - private ObservableCollection materialDataGrid = new ObservableCollection(); + private ObservableCollection materialDataGrid = new ObservableCollection(); - public ObservableCollection MaterialDataGrid + public ObservableCollection MaterialDataGrid { get { return materialDataGrid; } set => SetProperty(ref materialDataGrid, value); @@ -170,8 +190,8 @@ namespace Aucma.Core.Palletiz.ViewModels /// /// 初始化下拉列表 /// - private BaseOrderInfo selectedDataItem; - public BaseOrderInfo SelectedDataItem + private ProductAllModel selectedDataItem; + public ProductAllModel SelectedDataItem { get { return selectedDataItem; } set => SetProperty(ref selectedDataItem, value); @@ -191,8 +211,9 @@ namespace Aucma.Core.Palletiz.ViewModels if (info != null) { PlanInfo = info; - SpaceInfo.MaterialType = info.MaterialCode; - SpaceInfo.typeNameA = info.MaterialName; + + SpaceInfo.MaterialType = info.ProductCode; + SpaceInfo.typeNameA = info.ProductModel; } } @@ -217,8 +238,8 @@ namespace Aucma.Core.Palletiz.ViewModels #endregion #region 计划信息 - private BaseOrderInfo planInfo = new BaseOrderInfo(); - public BaseOrderInfo PlanInfo + private ProductAllModel planInfo = new ProductAllModel(); + public ProductAllModel PlanInfo { get { return planInfo; } set => SetProperty(ref planInfo, value); @@ -433,11 +454,18 @@ namespace Aucma.Core.Palletiz.ViewModels { if (!string.IsNullOrEmpty(searchText)) { - var infos = await _baseOrderInfoServices.QueryAsync(x => (x.MaterialName.Contains(searchText) || x.MaterialCode.Contains(searchText))); + List list = _codeBindingRecordServices.GetAllProductModel(); + if (list != null) + { + list = list.Where(x => x.ProductName.Contains(searchText)).ToList(); + if (list == null || list.Count == 0) return; + } + + // var infos = await _baseOrderInfoServices.QueryAsync(x => (x.MaterialName.Contains(searchText) || x.MaterialCode.Contains(searchText))); MaterialDataGrid.Clear(); Application.Current.Dispatcher.Invoke(() => { - foreach (BaseOrderInfo info in infos) + foreach (ProductAllModel info in list) { MaterialDataGrid.Add(info); } diff --git a/Aucma.Core.Palletiz/ViewModels/SetRangeWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/SetRangeWindowViewModel.cs new file mode 100644 index 00000000..5e5acdc1 --- /dev/null +++ b/Aucma.Core.Palletiz/ViewModels/SetRangeWindowViewModel.cs @@ -0,0 +1,186 @@ +using Admin.Core.Model; +using Aucma.Core.Palletiz.config; +using Aucma.Core.Palletiz.Models; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Speech.Synthesis; + +namespace Aucma.Core.Palletiz.ViewModels +{ + + public partial class SetRangeWindowViewModel : ObservableObject + { + private static AppConfig config = new AppConfig(); + + public List jumpRanges = new List(); + + public SetRangeWindowViewModel() + { + InitDataGrid(); + DeleteCommand = new RelayCommand(obj => Delete(obj)); + + } + public void Delete(object obj) + { + MessageBoxResult result = MessageBox.Show("确认删除吗？", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result == MessageBoxResult.Yes) + { + string objId = obj.ToString(); + Console.WriteLine(objId); + JumpRange delete = config.GetJumpRanges().FirstOrDefault(x => x.ObjId == int.Parse(objId)); + string deleteStr = $"[{delete.MinModel}-{delete.MaxModel}-{delete.OddSpaceRange}-{delete.EvenSpaceRange}]"; + // 配置文件减去该字符串 + // string temp = config.RangeConfig; + // string result1 = temp.Replace(deleteStr, ""); + config.RangeConfig = config.RangeConfig.Replace(deleteStr, ""); + MessageBox.Show("删除成功"); + InitDataGrid(); + + } + + + } + + /// + /// 初始化配置文件的角度列表 + /// + public void InitDataGrid() + { + int id = 1; + ListItems.Clear(); + List list = config.GetJumpRanges(); + if (list == null || list.Count == 0) return; + foreach(JumpRange jumpRange in list) + { + ListItems.Add(jumpRange); + } + + } + #region 参数定义 + + /// + /// 删除 + /// + public RelayCommand DeleteCommand { get; set; } + + + private ObservableCollection listItems = new ObservableCollection() { }; + public ObservableCollection ListItems + { + get { return listItems; } + set + { + listItems = value; + OnPropertyChanged();//属性通知 + } + } + + + + private string minModel; + public string MinModel + { + get => minModel; + set => SetProperty(ref minModel, value); + } + + private string maxModel; + public string MaxModel + { + get => maxModel; + set => SetProperty(ref maxModel, value); + } + + /// + /// 奇数货道旋转角 + /// + private int _selectedOddNumber; + public int SelectedOddNumber + { + get { return _selectedOddNumber; } + set + { + _selectedOddNumber = value; + OnPropertyChanged(nameof(SelectedOddNumber)); + } + } + + /// + /// 偶数货道旋转角 + /// + private int _selectedEvenNumber; + public int SelectedEvenNumber + { + get { return _selectedEvenNumber; } + set + { + _selectedEvenNumber = value; + OnPropertyChanged(nameof(SelectedEvenNumber)); + } + } + + + #endregion + + + + + #region + [RelayCommand] + private async Task Save(string obj) + { + MessageBoxResult result = MessageBox.Show("确认保存吗？", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result == MessageBoxResult.Yes) + { + config.RangeConfig = config.RangeConfig + $"[{MinModel}-{MaxModel}-{SelectedOddNumber}-{SelectedEvenNumber}]"; + MessageBox.Show("保存成功"); + + + InitDataGrid(); + } + } + + /// + /// 根据货物容积确定旋转规则 转180度发1，不转发3 + /// + /// + /// + public int JudgeRotation(int spaceCode, int prodWeight) + { + try + { + List list = config.GetJumpRanges(); + foreach (JumpRange range in list) + { + if (range.MinModel <= prodWeight && range.MaxModel > prodWeight) // 找到该型号规则 + { + if (spaceCode % 2 == 0) // 偶数货道 + { + return range.EvenSpaceRange == 0 ? 3 : 1; + } + else + { + return range.OddSpaceRange == 0 ? 3 : 1; + } + } + } + } + catch (Exception ex) + { + Console.WriteLine("JudgeRotation" + ex.Message); + } + return -1; + } + #endregion + + + + } +} \ No newline at end of file diff --git a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs index 67e177ae..03338044 100644 --- a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs @@ -1,6 +1,11 @@ -using Aucma.Core.Palletiz.Models; +using Admin.Core.Common; +using Admin.Core.IService; +using Admin.Core.Model; +using Aucma.Core.Palletiz.Models; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using Elasticsearch.Net; +using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -14,20 +19,41 @@ namespace Aucma.Core.Palletiz.ViewModels public partial class StatisticsPageViewModel : ObservableObject { public StatisticsPageViewModel() { LoadData(); } - + private readonly IRecordInStoreServices? _recordInstoreServices = App.ServiceProvider.GetService(); List materialComplateInfos = new List(); + public string storeCodeA = Appsettings.app("StoreInfo", "PalletizStoreCodeA"); + + public string storeCodeB = Appsettings.app("StoreInfo", "PalletizStoreCodeB"); #region 加载DataGrid数据 - private void LoadData() + private async void LoadData() { + try + { + + List list = await _recordInstoreServices.QueryAsync(x => x.StoreCode == storeCodeA || x.StoreCode == storeCodeB); + if (list != null && list.Count > 0) + { + foreach (RecordInStore record in list) + { + MaterialDataGrid.Add(record); + } + } + } + catch (Exception ex) + { + Console.WriteLine("" + ex.Message.ToString()); + + } + //MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 }); } #endregion #region 初始化datagrid - private ObservableCollection materialDataGrid = new ObservableCollection(); - public ObservableCollection MaterialDataGrid + private ObservableCollection materialDataGrid = new ObservableCollection(); + public ObservableCollection MaterialDataGrid { get { return materialDataGrid; } set diff --git a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml index b8919b8e..6d65bd96 100644 --- a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml +++ b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml @@ -5,96 +5,143 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" - Title="手动分垛" Height="800" Width="800" Name="window" Background="White" - ResizeMode="NoResize" Topmost="True"> - - - - + Title="手动分垛" Height="800" Width="1300" Name="window" Background="White" + ResizeMode="NoResize"> - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - + + - - - - - - - @@ -212,8 +212,8 @@ --> - diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs b/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs index a57fb1c5..8b88d1b1 100644 --- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs +++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs @@ -27,6 +27,17 @@ namespace Aucma.Core.Palletiz.Views InitializeComponent(); this.DataContext = new IndexControlViewModel(); } - + + private void Exit_Click(object sender, RoutedEventArgs e) + { + SetRangeWindow window = new SetRangeWindow(); + window.ShowDialog(); + } + + private void Minimized_Click(object sender, RoutedEventArgs e) + { + HandPalletizView window = new HandPalletizView(); + window.ShowDialog(); + } } } diff --git a/Aucma.Core.Palletiz/Views/SelectType.xaml b/Aucma.Core.Palletiz/Views/SelectType.xaml index 6ff85de0..b9a233a3 100644 --- a/Aucma.Core.Palletiz/Views/SelectType.xaml +++ b/Aucma.Core.Palletiz/Views/SelectType.xaml @@ -135,11 +135,13 @@ + SelectedItem="{Binding SelectedDataItem}" SelectionChanged="DataGrid_SelectionChanged" > - - + + + + @@ -170,11 +172,11 @@ - + - + @@ -232,8 +234,9 @@ --> - --> - - - - - - - + + + + + + diff --git a/Aucma.Core.Palletiz/appsettings.json b/Aucma.Core.Palletiz/appsettings.json index 2450cebb..79a0fc66 100644 --- a/Aucma.Core.Palletiz/appsettings.json +++ b/Aucma.Core.Palletiz/appsettings.json @@ -175,7 +175,7 @@ }, "TouchSocket": { "Enabled": true, - "Address": "10.10.92.231:5000" + "Address": "10.10.92.232:5000" } }, "ScannerServer": [ diff --git a/Aucma.Core.Palletiz/config/AppConfig.cs b/Aucma.Core.Palletiz/config/AppConfig.cs index 935aad32..0c138b4d 100644 --- a/Aucma.Core.Palletiz/config/AppConfig.cs +++ b/Aucma.Core.Palletiz/config/AppConfig.cs @@ -1,14 +1,58 @@ using Admin.Core.Common; +using Admin.Core.Common.Config; +using Aucma.Core.Palletiz.Models; +using NPOI.SS.Util; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Documents; namespace Aucma.Core.Palletiz.config { - internal class AppConfig + + internal class AppConfig { + + private static IniHelper iniHelper = new IniHelper(System.Environment.CurrentDirectory + "/config/App.InI"); + public AppConfig() + { + + } + + public List GetJumpRanges() + { + List jumpRanges = new List(); + int id = 1; + string configStr = RangeConfig; + string[] configs = configStr.Split(new[] { "][" }, StringSplitOptions.RemoveEmptyEntries); + for (int i = 0; i < configs.Length; i++) + { + configs[i] = configs[i].Trim('[', ']'); + // Console.WriteLine(configs[i]); + } + foreach (string config in configs) + { + string[] parts = config.Split('-'); + List ints = new List(); + foreach (string part in parts) + { + ints.Add(int.Parse(part)); + } + JumpRange temp = new JumpRange() + { + ObjId = id++, + MinModel = ints[0], + MaxModel = ints[1], + OddSpaceRange = ints[2], + EvenSpaceRange = ints[3] + }; + jumpRanges.Add(temp); + } + return jumpRanges; + } + /// /// 仓库编号 /// @@ -32,5 +76,15 @@ namespace Aucma.Core.Palletiz.config new PlcConfig(){spaceCode = 13,spaceArea = "A",address = "X1133"}, new PlcConfig(){spaceCode = 14,spaceArea = "A",address = "X1139"} }; + + + public string RangeConfig + { + get { return iniHelper.IniReadValue("RangeConfig", "rangeString"); } + set { iniHelper.IniWriteValue("RangeConfig", "rangeString", value); } + } } } + + + diff --git a/Aucma.Core.PrintTo/Assets/Images/favicon.ico b/Aucma.Core.PrintTo/Assets/Images/favicon.ico new file mode 100644 index 00000000..3a4f8e6f Binary files /dev/null and b/Aucma.Core.PrintTo/Assets/Images/favicon.ico differ diff --git a/Aucma.Core.PrintTo/Assets/Images/log.png b/Aucma.Core.PrintTo/Assets/Images/log.png new file mode 100644 index 00000000..108e91b2 Binary files /dev/null and b/Aucma.Core.PrintTo/Assets/Images/log.png differ diff --git a/Aucma.Core.PrintTo/Assets/Images/login-background.png b/Aucma.Core.PrintTo/Assets/Images/login-background.png new file mode 100644 index 00000000..40909f97 Binary files /dev/null and b/Aucma.Core.PrintTo/Assets/Images/login-background.png differ diff --git a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj index 012acd71..fe6ff038 100644 --- a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj +++ b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj @@ -5,18 +5,32 @@ net6.0-windows enable true + favicon.ico + + + + + + + + + + + + + @@ -59,7 +73,7 @@ PreserveNewest - PreserveNewest + Always diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index 23881587..c36560d4 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -1,4 +1,5 @@ -using Admin.Core.IService; +using Admin.Core.Common; +using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.ViewModels; using Aucma.Core.PrintTo.Models; @@ -6,6 +7,7 @@ using Aucma.Core.PrintTo.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; +using FastReport; using log4net; using Microsoft.Extensions.DependencyInjection; using System; @@ -51,7 +53,9 @@ namespace Aucma.Core.PrintTo.ViewModels Datalist.Clear(); List list = await _baseOrderInfoServices.QueryPrintInfo(); if (list == null) return; - list= list.OrderBy(d => d.CreateTime).ToList(); + list= list.Where(d=>d.PlanAmount>d.CompleteAmount).ToList(); + if (list == null) return; + list = list.OrderBy(d => d.CreateTime).ToList(); var printBarCode = await _printBarCodeServices.QueryAsync(); foreach (var item in list) { @@ -406,5 +410,49 @@ namespace Aucma.Core.PrintTo.ViewModels } #endregion + + #region 测试打印 + [RelayCommand] + public void GetTest() + { + string MaterialCode = "8301501093", + falg = "L"; + string barCode = $"{falg}{DateTime.Now.ToString("yyMMdd")}{MaterialCode}"; + string printer = Appsettings.app("Printer", "PrinterName"); + for (int i = 1; i < 123; i++) + { + string code = i.ToString().PadLeft(4, '0'); + + #region 打印 + + //对接打印机 + Report barReport = new Report(); + barReport.Load(System.Environment.CurrentDirectory + @"\Report\MaterialBar.frx");//打印报表位置 + + // 设置打印机和打印选项 + barReport.PrintSettings.ShowDialog = false; // 是否打开打印机选择框 + barReport.PrintSettings.Printer = printer; // 设置打印机名称 + barReport.PrintSettings.Copies = 1; // 设置打印份数 + barReport.SetParameterValue("BoxBarData.Id", barCode + code); + barReport.SetParameterValue("BoxBarData.Order_No", "11260310");//订单号 + barReport.SetParameterValue("BoxBarData.Order_Material_Name", "BC/BD-100HT.白");//物料简码 + barReport.SetParameterValue("BoxBarData.Bar_Code", barCode + code);//二维码 + barReport.Print(); + + #endregion + + PrintBarCode printBarCode = new PrintBarCode(); + printBarCode.MaterialBarcode = barCode + code; + printBarCode.PrintBarType = 2;//内胆码 + printBarCode.OrderCode = "11260310"; + printBarCode.MaterialCode = "8301501093"; + printBarCode.MaterialName = "内胆部件,BC/BD-100HT,预涂钢板,标准白,成型线,N"; + printBarCode.PrintTime = DateTime.Now; + printBarCode.SupplementMaterial = 0; + + var num = _printBarCodeServices.AddAsync(printBarCode).Result; + } + } + #endregion } } diff --git a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs index 348a680a..ec9cd7b8 100644 --- a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs @@ -7,6 +7,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; using FastReport; +using FastReport.DevComponents.DotNetBar; using log4net; using Microsoft.Extensions.DependencyInjection; using StackExchange.Profiling.Internal; @@ -323,21 +324,33 @@ namespace Aucma.Core.PrintTo.ViewModels string barCode = string.Empty; if (_printType== 200) { - string rowNum = GetMaxNumAsync(item.MaterialCode,"B").Result;//最大值+1 - barCode = $"B{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{rowNum}"; + barCode = GetMaxNumAsync(item.MaterialCode,"B").Result;//最大值+1 + if (string.IsNullOrEmpty(barCode)) + { + printState = PrintState.Paused; + SetPaused(); + continue; + } + //barCode = $"B{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{rowNum}"; PrintProgress = $"[{PrintAmount}/{i}] {barCode}"; printBarCode.MaterialBarcode = barCode; printBarCode.PrintBarType = 1; - Console.WriteLine($"B{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{rowNum}"); + Console.WriteLine($"{barCode}"); } if (_printType == 500) { - string rowNum = GetMaxNumAsync(item.MaterialCode, "L").Result;//最大值+1 - barCode = $"L{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{rowNum}"; + barCode = GetMaxNumAsync(item.MaterialCode, "B").Result;//最大值+1 + if (string.IsNullOrEmpty(barCode)) + { + printState = PrintState.Paused; + SetPaused(); + continue; + } + // barCode = $"L{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{rowNum}"; PrintProgress = $"[{PrintAmount}/{i}] {barCode}"; printBarCode.MaterialBarcode = barCode; printBarCode.PrintBarType = 2;//内胆码 - Console.WriteLine($"L{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{rowNum}"); + Console.WriteLine($"{barCode}"); } #region 打印 @@ -414,13 +427,15 @@ namespace Aucma.Core.PrintTo.ViewModels /// public async Task GetMaxNumAsync(string MaterialCode,string falg) { + string barCode = $"{falg}{DateTime.Now.ToString("yyMMdd")}{MaterialCode}"; try { + List tempList = new List(); - var list = await _printBarCodeServices.QueryAsync(d => d.MaterialBarcode.Contains(MaterialCode) && d.MaterialBarcode.Substring(0, 1).Equals(falg)); + var list = await _printBarCodeServices.QueryAsync(d => d.MaterialBarcode.Contains(barCode) ); if (list.Count() == 0) { - return "0001"; + return barCode+"0001"; } foreach (var item in list) { @@ -428,15 +443,23 @@ namespace Aucma.Core.PrintTo.ViewModels int num = Convert.ToInt32(code); tempList.Add(num); } + int row = tempList.Max() + 1; + if (row==10000) + { + MessageBox.Show("订单打印数据已经超过10000！无法查询打印条码数据。", "系统提醒"); + return null; + } string maxStr = (tempList.Max() + 1).ToString(); string rowNum = maxStr.PadLeft(4, '0'); - return rowNum; + return barCode+rowNum; } catch { - return "0001"; + return barCode+"0001"; } } + + #endregion #endregion diff --git a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs index b6a207e5..865e4337 100644 --- a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs @@ -7,6 +7,7 @@ using Aucma.Core.PrintTo.Models; using Aucma.Core.PrintTo.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.Messaging; using log4net; using Microsoft.Extensions.DependencyInjection; using System; @@ -30,6 +31,7 @@ namespace Aucma.Core.PrintTo.ViewModels _printSuppleMentBarCodeServices = App.ServiceProvider.GetService(); _baseOrderInfoServices = App.ServiceProvider.GetService(); Task.WaitAll(LoadData()); + WeakReferenceMessenger.Default.Register(this, Recive); } #region 选中订单参数 @@ -73,11 +75,16 @@ namespace Aucma.Core.PrintTo.ViewModels MessageBox.Show("请选中要补打的条码！", "系统提醒"); return; } - int Id = Convert.ToInt32(obj); + if (string.IsNullOrWhiteSpace(obj)) + { + MessageBox.Show("请选中要补打的条码！", "系统提醒"); + return; + } + int Id = Convert.ToInt32(obj); var printSuppleMentBarCode = _printSuppleMentBarCodeServices.FirstAsync(d => d.ObjId == Id).Result; if (printSuppleMentBarCode != null) { - if (printSuppleMentBarCode.IsPrint==1) + if (printSuppleMentBarCode.IsPrint=="1") { MessageBox.Show("选中的条码已补打过，请选择其他未补打条码！", "系统提醒"); return; @@ -156,7 +163,7 @@ namespace Aucma.Core.PrintTo.ViewModels private async Task LoadData() { - var list = await _printSuppleMentBarCodeServices.QueryAsync(); + var list = await _printSuppleMentBarCodeServices.QueryAsync(d=>d.IsPrint==null|| d.IsPrint == ""); if (list == null) return; foreach (var item in list) @@ -200,5 +207,22 @@ namespace Aucma.Core.PrintTo.ViewModels } } #endregion + + #region 刷新列表-其他界面刷新该方法 + /// + /// 刷新列表 + /// + /// + /// + private void Recive(object recipient, string message) + { + if (message == "RefreshSupplement") + { + Datalist.Clear(); + Task.WaitAll(LoadData()); + } + + } + #endregion } } diff --git a/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs b/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs index bae51344..41ec61db 100644 --- a/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs @@ -82,7 +82,7 @@ namespace Aucma.Core.PrintTo.ViewModels #endregion //打印完成 不可以再次打印 - printSuppleMentBarCode.IsPrint = 1; + printSuppleMentBarCode.IsPrint = "1"; printSuppleMentBarCode.PrintTime = DateTime.Now; await _printSuppleMentBarCodeServices.UpdateAsync(printSuppleMentBarCode); //打印完成 @@ -229,7 +229,27 @@ namespace Aucma.Core.PrintTo.ViewModels } #endregion + #region 关闭当前界面 + /// + /// 关闭当前界面 + /// + /// + [RelayCommand] + public void CloseWindow(object parameter) + { + var window = parameter as Window; + if (window == null) return; + + + if (MessageBox.Show("确定要退出打印吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) + { + printState = PrintState.Stopped; + WeakReferenceMessenger.Default.Send("RefreshSupplement");//刷新窗口 + window.Close(); + } + } + + #endregion - } } diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml index 8014b7d2..2d75ed70 100644 --- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml @@ -166,6 +166,7 @@