From 91808221759aca287573a9c1018fc2e65b1bfd59 Mon Sep 17 00:00:00 2001 From: wenjy Date: Mon, 25 Mar 2024 17:45:15 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.Core.Api/Admin.Core.Model.xml | 130 +++ .../Admin.Core.Api.csproj.nuget.dgspec.json | 803 +++++++++------ .../obj/Admin.Core.Api.csproj.nuget.g.props | 14 +- .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 143057 -> 144998 bytes Admin.Core.Api/obj/project.assets.json | 51 +- Admin.Core.Api/obj/project.nuget.cache | 458 ++++----- Admin.Core.Common/Helper/StringChange.cs | 17 + .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 2 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../IService_New/IBaseSpaceInfoServices.cs | 26 + .../IService_New/IProductOffLineServices.cs | 24 + .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Admin.Core.Model/Model_New/BaseSpaceInfo.cs | 8 +- Admin.Core.Model/Model_New/ProductOffline.cs | 138 +++ .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ...Admin.Core.RealTimeService.AssemblyInfo.cs | 2 +- ...e.RealTimeService.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Service_New/BaseSpaceInfoServices.cs | 69 ++ .../Service_New/ProductOffLineServices.cs | 77 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- Admin.Core.Socket/TouchSocketService.cs | 43 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Assets/Styles/DefaultStyles.xaml | 32 + .../Aucma.Core.Palletiz.csproj | 1 + .../Business/InstoreBusiness.cs | 914 ++++-------------- Aucma.Core.Palletiz/Business/MvCodeHelper.cs | 726 -------------- .../Models/BaseSpaceInfoModel.cs | 128 --- Aucma.Core.Palletiz/Startup.cs | 11 +- .../ViewModels/HandPalletizViewModel.cs | 36 +- .../ViewModels/IndexPageViewModel.cs | 347 ++----- .../ViewModels/MainWindowViewModel.cs | 6 - Aucma.Core.Palletiz/Views/IndexPageView.xaml | 375 +++---- .../Views/IndexPageView.xaml.cs | 2 +- Aucma.Core.Palletiz/appsettings.json | 6 +- Aucma.Core.Palletiz/config/AppConfig.cs | 36 + Aucma.Core.Palletiz/config/PlcConfig.cs | 18 + .../GeneratedInternalTypeHelper.g.i.cs | 2 +- .../HwControlLib.AssemblyInfo.cs | 2 +- .../HwControlLib.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 239 -> 324 bytes .../HwControlLib_MarkupCompile.i.cache | 6 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 31 +- .../obj/HwControlLib.csproj.nuget.g.props | 10 +- HwControlLib/obj/project.assets.json | 33 +- HwControlLib/obj/project.nuget.cache | 4 +- 77 files changed, 1960 insertions(+), 2708 deletions(-) create mode 100644 Admin.Core.Model/Model_New/ProductOffline.cs delete mode 100644 Aucma.Core.Palletiz/Business/MvCodeHelper.cs delete mode 100644 Aucma.Core.Palletiz/Models/BaseSpaceInfoModel.cs create mode 100644 Aucma.Core.Palletiz/config/AppConfig.cs create mode 100644 Aucma.Core.Palletiz/config/PlcConfig.cs diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 639cdc26..deabdb4e 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -771,6 +771,131 @@ 创建时间 + + + 成品下线表 + + + + + + + + + + 计划工厂 + + + + + 公司条码 + + + + + 工单号 + + + + + 销售订单号 + + + + + 销售行号 + + + + + 物料编码 + + + + + 产品型号 + + + + + 物料描述 + + + + + 产品类型 + + + + + 验证组合 + + + + + 标签特征 + + + + + 产品条码编码 + + + + + 主型号 + + + + + 版本号 + + + + + 用途位 + + + + + 流通特性 + + + + + 生成日期 + + + + + 扫描时间 + + + + + 箱体码 + + + + + 产线编号 + + + + + 上传条码系统保存接口返回信息 + + + + + 当前登录班组(一线白班，一线夜班，二线白班，二线夜班) + + + + + 下传plc放行结果，下传为1，plc应答为2 + + 箱体发泡夹具完工数据 @@ -1181,6 +1306,11 @@ 分垛使用字段,记录同型号上次入的货道，如FD01_002 == >记录上次货道ObjId + + + 货道区域:A\B + + SAP BOM 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 a6a7db48..d14128d3 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,23 +1,26 @@ { "format": 1, "restore": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -25,21 +28,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -48,6 +52,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -82,24 +91,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -107,15 +119,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -124,6 +137,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -271,24 +289,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -296,15 +317,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -313,6 +335,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -344,24 +371,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -369,51 +399,52 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" } } } @@ -422,6 +453,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -449,24 +485,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -474,18 +513,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -494,6 +534,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -515,24 +560,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -540,18 +588,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -560,6 +609,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -581,24 +635,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -606,15 +663,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -623,6 +681,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -644,24 +707,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -669,15 +735,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -686,6 +753,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -707,24 +779,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -732,8 +807,9 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -745,6 +821,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -796,24 +877,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -821,21 +905,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -844,6 +929,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -865,24 +955,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", "projectName": "Admin.Core.Socket", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\obj\\", + "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\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -890,18 +983,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -910,6 +1004,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -945,24 +1044,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -970,27 +1072,28 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -999,6 +1102,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1026,24 +1134,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1051,8 +1162,9 @@ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1064,6 +1176,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1091,24 +1208,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", "projectName": "Aucma.Core.PerfusionTask", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\obj\\", + "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\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1116,21 +1236,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1139,6 +1260,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1160,24 +1286,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1185,8 +1314,9 @@ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1198,6 +1328,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1225,24 +1360,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1250,18 +1388,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1270,6 +1409,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1291,24 +1435,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1316,15 +1463,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1333,6 +1481,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1360,24 +1513,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1385,18 +1541,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1405,6 +1562,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1432,24 +1594,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", "projectName": "Aucma.Core.SheetMetalTasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\obj\\", + "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\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1457,18 +1622,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1477,6 +1643,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1498,24 +1669,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1523,21 +1697,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1546,6 +1721,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1567,24 +1747,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", "projectName": "Aucma.Core.TemperatureTask", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\obj\\", + "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\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1592,15 +1775,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -1609,6 +1793,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1630,7 +1819,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index 7b07b2b8..58649efa 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -5,20 +5,22 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.8.1 + 6.9.1 - - + + + + - C:\Users\admin\.nuget\packages\touchsocket.core\2.0.0 - C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\Lenovo\.nuget\packages\touchsocket.core\2.0.0 + C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index 713a1a12..66ca61e7 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 1e38d395..0e08a47e 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 @@ -73780d5008cbec804434f69d154fc762341035e2cd5f22b4063ce26db26ec096 +84860ed5a97fc98413e2de33692ffc705dd54b8b7b2dda2f269c04c5cd160790 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 2da89fb6..60b6cf63 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,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index 4dfe8b1d4ec8f5bb7b4d5e0079b4c6fbb28782fd..f43e60d74734ea0f581f7adaa9524bc31dbaac05 100644 GIT binary patch delta 21121 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 GetEmptySpaceInfo(string store); List GetSpaceInfos(string storeCode); + + + /// + /// 获取指定的货道信息 + /// + /// + /// + void GetSpaceInfosByExpression(out List spaceinfos, Expression> whereExpression = null); + + /// + /// 根据物料类型获取指定仓库的货道信息 + /// + /// + /// + /// + void GetSpaceInfoByMaterialType(out List spaceinfos, string storeCode, string materialType); + + + /// + /// 更新货道信息 + /// + /// + /// + bool UpdateSpaceInfo(List spaceinfos); } } \ 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 4cc77a1a..1eca7ed7 100644 --- a/Admin.Core.IService/IService_New/IProductOffLineServices.cs +++ b/Admin.Core.IService/IService_New/IProductOffLineServices.cs @@ -1,7 +1,9 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; +using System; using System.Collections.Generic; +using System.Linq.Expressions; using System.Threading.Tasks; namespace Admin.Core.IService @@ -27,5 +29,27 @@ namespace Admin.Core.IService public string SaveBarcodeInfo(string Barcode, string Created_By, string Order_number, int Order_type); + /// + /// 获取所有已下线成品信息 + /// + /// + /// + void GetProductInfos(out List productOfflines, Expression> whereExpressio = null); + + /// + /// 根据SN条码获取已下线成品信息 + /// + /// + /// + void GetProductInfosBySnCode(string snCode, out ProductOffline productOffline); + + /// + /// 修改下线记录 + /// + /// + /// + bool UpdateProductInfo(ProductOffline productOffline); + + } } \ No newline at end of file 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 294fa29c..d254de2b 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,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 a4050c26..e3bf5fc5 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 @@ -995789d74271b8c3d23be86c14dce45c09267ea3bfd6164be4519e46ce7d91b8 +7be8fb84c98936223c16d3b40f216dafcd65db0db33159afd40990ce9fa54678 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 b4c8c9fc..ddd2b80b 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Model/Model_New/BaseSpaceInfo.cs b/Admin.Core.Model/Model_New/BaseSpaceInfo.cs index f300eb36..6fab149f 100644 --- a/Admin.Core.Model/Model_New/BaseSpaceInfo.cs +++ b/Admin.Core.Model/Model_New/BaseSpaceInfo.cs @@ -162,6 +162,12 @@ namespace Admin.Core.Model /// 分垛使用字段,记录同型号上次入的货道，如FD01_002 == >记录上次货道ObjId /// [SugarColumn(ColumnName = "LAST_SPACE")] - public string LastSpace { get; set; } + public string LastSpace { get; set; } + + /// + /// 货道区域:A\B + /// + [SugarColumn(ColumnName = "SPACE_AREA")] + public string SpaceArea { get; set; } } } diff --git a/Admin.Core.Model/Model_New/ProductOffline.cs b/Admin.Core.Model/Model_New/ProductOffline.cs new file mode 100644 index 00000000..1833b3ce --- /dev/null +++ b/Admin.Core.Model/Model_New/ProductOffline.cs @@ -0,0 +1,138 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.Model_New +{ + /// + /// 成品下线表 + /// + [SugarTable("PRODUCT_OFFLINE", "AUCMA_SCADA")] + public class ProductOffline + { + /// + /// + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true)] + public decimal ObjId { get; set; } + /// + /// 计划工厂 + /// + [SugarColumn(ColumnName = "PRODUCT_FACTORY_CODE")] + public string ProductFactoryCode { get; set; } + /// + /// 公司条码 + /// + [SugarColumn(ColumnName = "PRODUCT_SNCODE")] + public string ProductSncode { get; set; } + /// + /// 工单号 + /// + [SugarColumn(ColumnName = "PRODUCT_ORDER_NO")] + public string ProductOrderNo { get; set; } + /// + /// 销售订单号 + /// + [SugarColumn(ColumnName = "PRODUCT_SALE_NO")] + public string ProductSaleNo { get; set; } + /// + /// 销售行号 + /// + [SugarColumn(ColumnName = "PRODUCT_SALE_LINE_NO")] + public string ProductSaleLineNo { get; set; } + /// + /// 物料编码 + /// + [SugarColumn(ColumnName = "PRODUCT_CODE")] + public string ProductCode { get; set; } + /// + /// 产品型号 + /// + [SugarColumn(ColumnName = "PRODUCT_MODEL")] + public string ProductModel { get; set; } + /// + /// 物料描述 + /// + [SugarColumn(ColumnName = "PRODUCT_NAME")] + public string ProductName { get; set; } + /// + /// 产品类型 + /// + [SugarColumn(ColumnName = "PRODUCT_TYPE")] + public string ProductType { get; set; } + /// + /// 验证组合 + /// + [SugarColumn(ColumnName = "PRODUCT_CHECK_INFO")] + public string ProductCheckInfo { get; set; } + /// + /// 标签特征 + /// + [SugarColumn(ColumnName = "PRODUCT_REMARK")] + public string ProductRemark { get; set; } + /// + /// 产品条码编码 + /// + [SugarColumn(ColumnName = "PRODUCT_BAR_NO")] + public string ProductBarNo { get; set; } + /// + /// 主型号 + /// + [SugarColumn(ColumnName = "PRODUCT_MASTER_MODEL")] + public string ProductMasterModel { get; set; } + /// + /// 版本号 + /// + [SugarColumn(ColumnName = "PRODUCT_VERSION")] + public string ProductVersion { get; set; } + /// + /// 用途位 + /// + [SugarColumn(ColumnName = "PRODUCT_USERINFO")] + public string ProductUserinfo { get; set; } + /// + /// 流通特性 + /// + [SugarColumn(ColumnName = "PRODUCT_CIRCULATE")] + public string ProductCirculate { get; set; } + /// + /// 生成日期 + /// + [SugarColumn(ColumnName = "PRODUCT_CREATEDATE")] + public string ProductCreatedate { get; set; } + /// + /// 扫描时间 + /// + [SugarColumn(ColumnName = "PRODUCT_SCANTIME")] + public DateTime? ProductScantime { get; set; } + /// + /// 箱体码 + /// + [SugarColumn(ColumnName = "BOX_CODE")] + public string BoxCode { get; set; } + /// + /// 产线编号 + /// + [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")] + public string ProductLineCode { get; set; } + /// + /// 上传条码系统保存接口返回信息 + /// + [SugarColumn(ColumnName = "SAVE_RETURN_INFO")] + public string SaveReturnInfo { get; set; } + /// + /// 当前登录班组(一线白班，一线夜班，二线白班，二线夜班) + /// + [SugarColumn(ColumnName = "LOGIN_TEAM")] + public string LoginTeam { get; set; } + /// + /// 下传plc放行结果，下传为1，plc应答为2 + /// + [SugarColumn(ColumnName = "PLC_RESULT")] + public string PlcResult { 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 0411ea5b..bed6041c 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+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 1f238001..5ce469b7 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 @@ -1b712b170964f1caaacc65c929d3c29729c899f231af7a3ba55583176cca2fd1 +e06bdf0ebe65ef932d0c6fd7d3baae5f10e155760c54fbb7fb60325fb50a3495 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 b49210f4..4bea6c27 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = 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 2d1922ac..e97ec8dd 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,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 97c3353c..b74136a9 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 @@ -6488b885597cc607705e82af6763f6196c779e4f0b4525f5ef1fb3449d558856 +b5644558dc744de4e30eba90d803ffea1e57637459e4c3671831cc71c7a9fcd8 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 8f33dc40..a5e40532 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = 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 347be560..4b38de59 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,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 51d4bd55..7bcd903a 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 @@ -efc561198173ae3698b722d3861fe5166dd13c55ff30f4dc9717b5666ce11451 +3268d8102eca1f6dea32d43510b3c796d3bd7d4838bf40e973c93200629c29a8 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 fda551fc..8f3ae2b8 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = 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 82aadd7c..06483d90 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,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 0100e00d..7681819e 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 @@ -bf5c82979746b8f9cef24fe069c3daf057e4bde435ced85bb38fcc400ecb0b6c +d0399735cc31acea60f87f26f248a937ea1b4fea77858ad3185274c66c912f12 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 7fe89e3c..614f9a4b 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs index d60e42a8..98853137 100644 --- a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs @@ -297,5 +297,74 @@ namespace Admin.Core.Service } return spaceInfos; } + + /// + /// 获取指定的货道信息 + /// + /// + /// + /// + public void GetSpaceInfosByExpression(out List spaceinfos, Expression> whereExpression = null) + { + try + { + var exp = whereExpression != null ? whereExpression : x => 1 == 1; + spaceinfos = _dal.Query(exp); + } + catch (Exception e) + { + throw new InvalidOperationException($"获取所有已下线成品信息异常:{e.Message}"); + } + } + + /// + /// 根据物料类型获取指定仓库的货道信息 + /// + /// + /// + /// + /// + public void GetSpaceInfoByMaterialType(out List spaceinfos, string storeCode, string materialType) + { + if (string.IsNullOrEmpty(storeCode)) + { + throw new ArgumentException($"根据物料类型获取指定仓库的货道信息异常:仓库编号为空"); + } + + if (string.IsNullOrEmpty(materialType)) + { + throw new ArgumentException($"根据物料类型获取指定仓库的货道信息异常:物料类型为空"); + } + + try + { + spaceinfos = _dal.Query(x => x.StoreCode == storeCode && x.MaterialType == materialType); + } + catch (Exception e) + { + throw new InvalidOperationException($"根据物料类型获取指定仓库的货道信息异常:{e.Message}"); + } + } + + /// + /// 更新货道信息 + /// + /// + /// + /// + public bool UpdateSpaceInfo(List spaceinfos) + { + bool result = false; + try + { + result = _dal.Update(spaceinfos); + } + catch (Exception e) + { + throw new InvalidOperationException($"更新货道信息异常:{e.Message}"); + } + + return result; + } } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/ProductOffLineServices.cs b/Admin.Core.Service/Service_New/ProductOffLineServices.cs index 76442c24..cabcee38 100644 --- a/Admin.Core.Service/Service_New/ProductOffLineServices.cs +++ b/Admin.Core.Service/Service_New/ProductOffLineServices.cs @@ -8,6 +8,7 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Threading.Tasks; namespace Admin.Core.Service @@ -18,11 +19,12 @@ namespace Admin.Core.Service private static readonly log4net.ILog log = LogManager.GetLogger(typeof(ProductOffLineServices)); #endregion private readonly IBaseRepository baseRepository; + private readonly IBaseRepository _rep; private ICodeBindingRecordRepository _codeBindingRecordRepository; - public ProductOffLineServices(IBaseRepository baseRepository) + public ProductOffLineServices(IBaseRepository baseRepository, IBaseRepository rep) { this.baseRepository = baseRepository; - + _rep = rep; } @@ -69,5 +71,76 @@ namespace Admin.Core.Service } } + /// + /// 获取所有已下线成品信息 + /// + /// + /// + /// + public void GetProductInfos(out List productOfflines, Expression> whereExpression = null) + { + try + { + var exp = whereExpression != null ? whereExpression : x => 1 == 1; + productOfflines = _rep.Query(exp); + } + catch (Exception e) + { + throw new InvalidOperationException($"获取所有已下线成品信息异常:{e.Message}"); + } + + } + + /// + /// 根据SN条码获取已下线成品信息 + /// + /// + /// + /// + public void GetProductInfosBySnCode(string snCode, out ProductOffline productOffline) + { + if (string.IsNullOrEmpty(snCode)) + { + throw new ArgumentException($"根据SN条码获取已下线成品信息异常:SN码为空"); + } + + try + { + productOffline = _rep.Query(x => x.ProductSncode == snCode).First(); + } + catch (Exception e) + { + throw new InvalidOperationException($"根据SN条码获取已下线成品信息异常:{e.Message}"); + } + } + + /// + /// 修改下线记录 + /// + /// + /// + /// + /// + public bool UpdateProductInfo(ProductOffline productOffline) + { + bool result = false; + + if (productOffline == null) + { + throw new ArgumentException($"修改下线记录异常:成品信息参数为空"); + } + + try + { + result = _rep.Update(productOffline); + } + catch (Exception e) + { + throw new InvalidOperationException($"修改下线记录异常:{e.Message}"); + } + + return result; + } + } } 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 650115ab..38a927e7 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,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 58bdc47e..e09c658b 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 @@ -f0342ace3869b9b2dd7e45aa4bce15647b407e7e8b010c0c6fecba7b7985c65b +602e3d4ff09d3c166749ecfcf3ba98f9f9678c6c255be546fc4b101df75abd22 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 8cc143a5..7659a045 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Socket/TouchSocketService.cs b/Admin.Core.Socket/TouchSocketService.cs index bc642013..40363327 100644 --- a/Admin.Core.Socket/TouchSocketService.cs +++ b/Admin.Core.Socket/TouchSocketService.cs @@ -35,6 +35,19 @@ namespace Admin.Core.Socket public delegate void ReceiveCodeDelegate(string IP,string code); public static event ReceiveCodeDelegate? ReceiveCodeDelegateEvent; + /// + /// 接收客户端指令委托 + /// + public delegate void ReceivedClientBuffer(SocketClient client, byte[] buffer); + public static event ReceivedClientBuffer? ReceivedClientBufferEvent; + + /// + /// 连接信息 + /// + /// + public delegate void RefreshClientInfo(TcpService tcpService); + public static event RefreshClientInfo? RefreshClientInfoEvent; + TcpService service; #region 初始化构造函数 @@ -54,18 +67,27 @@ namespace Admin.Core.Socket return EasyTask.CompletedTask; };//有客户端正在连接 service.Connected = (client, e) => { client.Logger.Info($"{client.IP}:{client.Port} 客户端连接成功！目前客户端连接数{service.Count}"); + + SetProdStoreClientId(client); + return EasyTask.CompletedTask; };//有客户端成功连接 service.Disconnected += (client, e) => { //有客户端断开连接 client.Logger.Info($"{client.IP}:{client.Port}客户端断开!"); RefreshStateEvent?.Invoke(client.IP, false); + RefreshClientInfoEvent?.Invoke(service); return EasyTask.CompletedTask; }; - service.Received = (client, byteBlock) => + service.Received = (client, e) => { + #region 原始Buffer + byte[] receivedBuffer = new byte[e.ByteBlock.Len]; + Array.Copy(e.ByteBlock.Buffer, 0, receivedBuffer, 0, e.ByteBlock.Len); + ReceivedClientBufferEvent?.Invoke(client, receivedBuffer); + #endregion try { - var mes = Encoding.UTF8.GetString(byteBlock.ByteBlock.Buffer, 0, byteBlock.ByteBlock.Len);//注意：数据长度是byteBlock.Len + var mes = Encoding.UTF8.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len //心跳包 if (mes== "heartbeat") { @@ -130,5 +152,22 @@ namespace Admin.Core.Socket #endregion + /// + /// 设置成品库扫码器的Id，将客户端ID设置为货道区域 + /// + /// + private void SetProdStoreClientId(SocketClient client) + { + if (client.IP == "192.168.106.102") + { + client.ResetId("A"); + } + else if (client.IP == "10.10.92.137") + { + client.ResetId("B"); + } + RefreshClientInfoEvent?.Invoke(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 e72f4a94..a4f93244 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,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] [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 13bd3789..47a197b9 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 @@ -884988e21b157fad7a1f8da431377752aad4da3380907ccff393770a33c9112b +2d524ba5bcdb8f1a42f6a39d9dbd988dcf79eda3262bc55165a1d9360b348b4f 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 88638f9a..9a880b7c 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,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Aucma.Core.Palletiz/Assets/Styles/DefaultStyles.xaml b/Aucma.Core.Palletiz/Assets/Styles/DefaultStyles.xaml index 5b18644d..0f8b3ef3 100644 --- a/Aucma.Core.Palletiz/Assets/Styles/DefaultStyles.xaml +++ b/Aucma.Core.Palletiz/Assets/Styles/DefaultStyles.xaml @@ -26,6 +26,38 @@ --> + + - - - - - - - - + + - - - + + + - + + + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -