From 0cd4f42b1993493a9c1d24e111f2448ec7f0bbd0 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Sun, 3 Mar 2024 12:26:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=B1=E9=97=A8?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=B8=8A=E4=BD=8D=E6=9C=BA=E2=80=94=E2=80=94?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=AB=E7=A0=81=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.Core.Api.csproj.nuget.dgspec.json | 76 +++++ .../obj/Admin.Core.Api.csproj.nuget.g.props | 3 +- .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 141138 -> 141225 bytes Admin.Core.Api/obj/project.assets.json | 7 +- Admin.Core.Api/obj/project.nuget.cache | 2 +- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 2 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- ...Admin.Core.RealTimeService.AssemblyInfo.cs | 2 +- ...e.RealTimeService.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- .../Aucma.Core.DoorFoam.csproj | 8 +- .../Business/CollectionFoamMachine.cs | 79 ++--- Aucma.Core.DoorFoam/Business/MvCodeHelper.cs | 284 ++++++++++++++++++ Aucma.Core.DoorFoam/Startup.cs | 10 +- .../ViewModels/MainWindowViewModel.cs | 26 ++ .../ViewModels/RealTimePageViewModel.cs | 28 +- Aucma.Core.DoorFoam/appsettings.json | 4 +- .../Views/HandPalletizView.xaml | 45 +-- .../Views/HandPalletizView.xaml.cs | 6 +- Aucma.Core.Scanner/Helper/MvCodeHelper.cs | 14 +- .../HwControlLib.AssemblyInfo.cs | 2 +- .../HwControlLib.AssemblyInfoInputs.cache | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 152 -> 239 bytes .../obj/HwControlLib.csproj.nuget.dgspec.json | 4 + .../obj/HwControlLib.csproj.nuget.g.props | 3 +- HwControlLib/obj/project.assets.json | 7 +- HwControlLib/obj/project.nuget.cache | 2 +- 48 files changed, 539 insertions(+), 125 deletions(-) create mode 100644 Aucma.Core.DoorFoam/Business/MvCodeHelper.cs 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 fbf527ac..30db0c7d 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 @@ -13,8 +13,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -91,8 +95,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -276,8 +284,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -345,8 +357,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -440,8 +456,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -502,8 +522,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -564,8 +588,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -623,8 +651,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -682,8 +714,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -767,8 +803,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -832,8 +872,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -909,8 +953,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -970,8 +1018,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1031,8 +1083,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1093,8 +1149,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1158,8 +1218,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1226,8 +1290,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1288,8 +1356,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -1353,8 +1425,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ 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 45fd8234..24c9600f 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,12 +5,13 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference 6.8.1 + 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 18b25463..416113a3 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+60c5f54c3d8d93d68f008d6dfcabe9fc57d1a982")] [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 2d92604c..ffa83db7 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 @@ -6595f7ba4e0a05ad222d8d47acb1a5dea054ac8fd23612b0d9b2c1a982a2210f +a93bec2e5ffdf4970a870b00ef63076582f8814a81b11aac5793b179560f6a09 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 1c7113a02ab17a5dbf039982b6af2d702f4dd0c7..89b3302e533237bf8f4294bcc7ea0b34cf00d98b 100644 GIT binary patch delta 121 zcmca~j$`F{jtLr!RU0*z_cJn0zSyrG5#(YOlbKgsl9-bd6BZm3P?Voul$fjFmYI`U zte|RSQDI@GYGfJXo0(jcU!0#-q7ar@T$-4p5L{B4l9?Y9oRL_RniAtz>YiE>keHmE Yn4Vh900fICu61d)ov__@0;A}30MyznY5)KL delta 29 lcmZ2^p5xLvjtLr!${RJ8_cJn1zSytc>_1_<{{+UU=>WN&3>yFd diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index 421b74c0..ce64005f 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -11297,7 +11297,8 @@ ] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\admin\\.nuget\\packages\\": {}, + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", @@ -11308,8 +11309,12 @@ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index a4e6030f..58500b2e 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "y71ivDyTYdR/IgUXlTvD3CXxLXbhiQ1Hb07ica+UKBq6fSSITCog9XyAeD/4mgcrQIw7WTZTNH1PnBd8KlSbhw==", + "dgSpecHash": "CegtX4ngQ9zPBSJ/sDLmsyWP/3p+JYLqzt3VARw/ViEWABeP85WCVrE4PcS24CD52tCdpZCtWFC1BlYzpx6uvg==", "success": true, "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index e59f1ec2..78883a16 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+60c5f54c3d8d93d68f008d6dfcabe9fc57d1a982")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index 7010b962..2d2656c4 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -b599770ee407fe896e0bee7dfc7103f5198f20a80e32c8697c91799b70e146ca +7ad81a09147b0478aa0b50225f58a9581fb29a1452bd9a328e249c4af9c9ba8b diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 88fe817c..e235b754 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+60c5f54c3d8d93d68f008d6dfcabe9fc57d1a982")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 8c2623c3..42d93272 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -6de8b0dcfc48b128033fd3bbdc30713db3e9facb0ff8080ceed7668b8701a863 +2fc7d476902952a95d287f6f5b416b2d2e0c4d9b481a5e49690d0af6f465138c diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 06d510fe..80f08c91 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index aaaf8bd1..58ca4cd9 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -dffc6a08829f7f9594af6c1484816eceabd35a3c35bbbd569549b474aba6e447 +d780f4c71d7f81730d6e88e43ff8d26d1f8e15b705f157a4bf086caa5e7da499 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 6f5418aa..0cd9d347 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+60c5f54c3d8d93d68f008d6dfcabe9fc57d1a982")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index a03d5773..e3975406 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -c439f0743b2ab061130800af9e199d9d748586e7dd45924dd104324c65f5343c +8726b4a34e466084643a48e8c0039a17689dbbba68bb056ab0191f984716dde6 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 12d6db84..fc4b8314 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index a6e90e7f..cdfea74e 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -b15ed3d62aa91c5139d415717d5d02b2369ed1631e05498b732534010ba56d6f +72f20f6cf98a472ebf4c20b336a615ec584766bd52e85cd9501f3b4e781988db 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 b18b5110..268689ba 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [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 1bd36a55..86b58924 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 @@ -b960962ff5ee8813163b448cfec6d88ec854758ac69b93268364326dae441531 +58e5bcaec14d01e659427d2a8c0b1fbc2e0da050bb91443cceff81b9cb2a3e6c 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 fdf56c4f..1ba50fcd 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [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 2e40fb45..005e2754 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 @@ -3c40f91aa5e16ca4d3191d787932e032eb151c5fa525bf72ef5053c26bc878bd +1ec56689cad54c12209e5fbd483faa339ac415e2614a8fd6b45ec357a392a616 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 89cfe860..c8a894b3 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+60c5f54c3d8d93d68f008d6dfcabe9fc57d1a982")] [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 a4fb1a48..311d4f37 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 @@ -ffe85bc2871e10e4f4deabf6433e768a4eb932a7d3809316277215a444c9f5c2 +0233e45d9021e3993970f80743611620290253700f9f88fdb16a4673a7d9f624 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 9707d0f6..eb59bd79 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [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 5e7a5810..4f0d0840 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 @@ -fe7c924978ded9c3cdf0f9f7492dccb0324b897050d32f2dd46ac8439851acac +4639e0ce1dff133705f35aae6cc343d3a434fc547d556f93e46bcf77a8fe9d80 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 dd6a686c..1498f498 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+60c5f54c3d8d93d68f008d6dfcabe9fc57d1a982")] [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 c8e11554..8bb97ffc 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 @@ -a9badd67957e2093975a45f0b8bdf4f368d78415c81f5178dbc72c651233d914 +4f26aea112ddb2e1ceead1b404f91a11042202d3d8738b7674a88a5c5fae49b0 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 338a4254..8f9ec7e2 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [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 9e28fae2..9a2fb840 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 @@ -41f96c06a6699d16272c9fa5c9313083b66b4d92c03c2e18edcec976d22fe73a +f7af35947834bb2b8700b1aa87f9fe428cf89bd259aefe95cb2c632699945ffb 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 f70da939..0ad8feb9 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+25500efc4a462e818da602852d62739817648ebd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1fc9493a7ff9eb3e5bc2b6109e38a8c263e3b897")] [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 e627c485..679f537b 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 @@ -b257f613a7d6a7d318c3b07b1b243b35b2419d441e95c4ece51dc9f3c406b9c8 +357d4cf1da9d0baaf00ea24891148cc7f0ef3028d39279eea9f552730b5fa818 diff --git a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj index 87091b19..10f45baa 100644 --- a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj +++ b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj @@ -1,7 +1,7 @@  - WinExe + Exe net6.0-windows enable true @@ -78,6 +78,12 @@ + + + ..\dll\MvCodeReaderSDK.Net.dll + + + Code diff --git a/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs index dd5d93a1..0efc8616 100644 --- a/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs +++ b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs @@ -159,46 +159,55 @@ namespace Aucma.Core.DoorFoam.Business /// private void ReadFillingRecord(PlcModel obj_1) { - if (obj_1 != null && obj_1.plc.IsConnected) + try { - if (obj_1.plc.ReadBool("DB50.DBX983.0")) + if (obj_1 != null && obj_1.plc.IsConnected) { - logHelper.Info("读取到发泡机A1枪结束信号"); - ReadGunData(obj_1, "DB50.896", gunKeys, "A1"); //A1枪数据 - int a = _lastShotRecordServices.AddAsync(gunKeys["A1"]).Result; - RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["A1"]); - RefreshGunDataDelegateEvent?.Invoke(gunKeys); - Thread.Sleep(2000); - } - else if (obj_1.plc.ReadBool("DB50.DBX1171.0")) - { - logHelper.Info("读取到发泡机B1枪结束信号"); - ReadGunData(obj_1, "DB50.1084", gunKeys, "B1"); //B1枪数据 - int a = _lastShotRecordServices.AddAsync(gunKeys["B1"]).Result; - RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["B1"]); - RefreshGunDataDelegateEvent?.Invoke(gunKeys); - Thread.Sleep(2000); - } - else if (obj_1.plc.ReadBool("DB50.DBX1359.0")) - { - logHelper.Info("读取到发泡机A2枪结束信号"); - ReadGunData(obj_1, "DB50.1272", gunKeys, "A2"); //A2枪数据 - int a = _lastShotRecordServices.AddAsync(gunKeys["A2"]).Result; - RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["A2"]); - RefreshGunDataDelegateEvent?.Invoke(gunKeys); - Thread.Sleep(2000); - } - else if (obj_1.plc.ReadBool("DB50.DBX1547.0")) - { - logHelper.Info("读取到发泡机B2结束信号"); - ReadGunData(obj_1, "DB50.1460", gunKeys, "B2"); //A2枪数据 - int a = _lastShotRecordServices.AddAsync(gunKeys["B2"]).Result; - RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["B2"]); - RefreshGunDataDelegateEvent?.Invoke(gunKeys); - Thread.Sleep(2000); + if (obj_1.plc.ReadBool("DB50.DBX983.0")) + { + logHelper.Info("读取到发泡机A1枪结束信号"); + ReadGunData(obj_1, "DB50.896", gunKeys, "A1"); //A1枪数据 + BoxLastShotRecord record = gunKeys["A1"]; + int a = _lastShotRecordServices.AddAsync(record).Result; + RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["A1"]); + RefreshGunDataDelegateEvent?.Invoke(gunKeys); + Thread.Sleep(2000); + } + else if (obj_1.plc.ReadBool("DB50.DBX1171.0")) + { + logHelper.Info("读取到发泡机B1枪结束信号"); + ReadGunData(obj_1, "DB50.1084", gunKeys, "B1"); //B1枪数据 + int a = _lastShotRecordServices.AddAsync(gunKeys["B1"]).Result; + RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["B1"]); + RefreshGunDataDelegateEvent?.Invoke(gunKeys); + Thread.Sleep(2000); + } + else if (obj_1.plc.ReadBool("DB50.DBX1359.0")) + { + logHelper.Info("读取到发泡机A2枪结束信号"); + ReadGunData(obj_1, "DB50.1272", gunKeys, "A2"); //A2枪数据 + int a = _lastShotRecordServices.AddAsync(gunKeys["A2"]).Result; + RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["A2"]); + RefreshGunDataDelegateEvent?.Invoke(gunKeys); + Thread.Sleep(2000); + } + else if (obj_1.plc.ReadBool("DB50.DBX1547.0")) + { + logHelper.Info("读取到发泡机B2结束信号"); + ReadGunData(obj_1, "DB50.1460", gunKeys, "B2"); //A2枪数据 + int a = _lastShotRecordServices.AddAsync(gunKeys["B2"]).Result; + RefreshLastShotDataDelegateEvent?.Invoke(gunKeys["B2"]); + RefreshGunDataDelegateEvent?.Invoke(gunKeys); + Thread.Sleep(2000); + } } + } + catch (Exception ex) + { + Console.WriteLine($"实时读取最后一枪数据失败:{ex.Message}"); + } } diff --git a/Aucma.Core.DoorFoam/Business/MvCodeHelper.cs b/Aucma.Core.DoorFoam/Business/MvCodeHelper.cs new file mode 100644 index 00000000..a45c91d6 --- /dev/null +++ b/Aucma.Core.DoorFoam/Business/MvCodeHelper.cs @@ -0,0 +1,284 @@ +using Admin.Core.Common; +using Aucma.Core.Scanner; +using MvCodeReaderSDKNet; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.DoorFoam.Business +{ + public class MvCodeHelper + { + + //private static AppConfig appConfig = AppConfig.Instance; + public static bool m_bGrabbing = true; + private static string lastCode; + private static List allScanners = Appsettings.app("ScannerServer").ToList(); + // 内胆扫码器ip + private static string LinerScannerIp = allScanners.First(x => x.Name == "扫码器1").Ip; + + + #region 委托事件 + + #region 门体匹配委托事件 + + #region 门体匹配扫码信息刷新 + /// + /// 门体匹配扫码信息刷新 + /// + /// + public delegate void DoorReceiveCodeDelegate(string code); + public static event DoorReceiveCodeDelegate DoorReceiveCodeDelegateEvent; + #endregion + + + #endregion + #endregion + + + public static void LinerImageCallbackFunc(IntPtr pData, IntPtr pstFrameInfoEx2, IntPtr pUser) + { + var stFrameInfo = (MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)Marshal.PtrToStructure(pstFrameInfoEx2, typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)); + + MvCodeReader.MV_CODEREADER_RESULT_BCR_EX2 stBcrResult = (MvCodeReader.MV_CODEREADER_RESULT_BCR_EX2)Marshal.PtrToStructure(stFrameInfo.UnparsedBcrList.pstCodeListEx2, typeof(MvCodeReader.MV_CODEREADER_RESULT_BCR_EX2)); + + // Console.WriteLine("CodeNum[" + Convert.ToString(stBcrResult.nCodeNum) + "]"); + if (stBcrResult.nCodeNum == 0) + { + Console.WriteLine("liner--->No Read 处理"); + } + for (Int32 i = 0; i < stBcrResult.nCodeNum; i++) + { + bool bIsValidUTF8 = IsTextUTF8(stBcrResult.stBcrInfoEx2[i].chCode); + if (bIsValidUTF8) + { + string strCode = Encoding.UTF8.GetString(stBcrResult.stBcrInfoEx2[i].chCode); + Console.WriteLine("Get CodeNum: " + "CodeNum[" + i.ToString() + "], CodeString[" + strCode.Trim().TrimEnd('\0') + "]"); + } + else + { + string strCode = Encoding.GetEncoding("GB2312").GetString(stBcrResult.stBcrInfoEx2[i].chCode); + Console.WriteLine("Get CodeNum: " + "CodeNum[" + i.ToString() + "], CodeString[" + strCode.Trim().TrimEnd('\0') + "]"); + // RefreshMaterialCodeStrEvent?.Invoke(strCode.Trim().TrimEnd('\0'), LinerScannerIp); + // 业务处理 + DoorReceiveCodeDelegateEvent?.Invoke(strCode.Trim().TrimEnd('\0')); + } + } + + MvCodeReader.MV_CODEREADER_OCR_INFO_LIST stOcrInfo = (MvCodeReader.MV_CODEREADER_OCR_INFO_LIST)Marshal.PtrToStructure(stFrameInfo.UnparsedOcrList.pstOcrList, typeof(MvCodeReader.MV_CODEREADER_OCR_INFO_LIST)); + + Console.WriteLine("ocrAllNum[" + Convert.ToString(stOcrInfo.nOCRAllNum) + "]"); + for (int i = 0; i < stOcrInfo.nOCRAllNum; i++) + { + string strOcrCharCode = Encoding.UTF8.GetString(stOcrInfo.stOcrRowInfo[i].chOcr); + Console.WriteLine("Get OcrInfo:" + "ocrNum[" + i.ToString() + "], ocrLen[" + Convert.ToString(stOcrInfo.stOcrRowInfo[i].nOcrLen) + "], ocrChar[" + strOcrCharCode.Trim().TrimEnd('\0') + "]"); + } + } + + + + public static void Liner() + { + + MvCodeReader.cbOutputEx2delegate ImageCallback; + + MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2 stFrameInfo = new MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2(); + MvCodeReader device = new MvCodeReader(); + int nRet = MvCodeReader.MV_CODEREADER_OK; + + do + { + // ch:枚举设备 | en:Enum device + MvCodeReader.MV_CODEREADER_DEVICE_INFO_LIST stDevList = new MvCodeReader.MV_CODEREADER_DEVICE_INFO_LIST(); + nRet = MvCodeReader.MV_CODEREADER_EnumDevices_NET(ref stDevList, MvCodeReader.MV_CODEREADER_GIGE_DEVICE); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Enum device failed:{0:x8}", nRet); + break; + } + Console.WriteLine("Enum device count : " + Convert.ToString(stDevList.nDeviceNum)); + if (0 == stDevList.nDeviceNum) + { + break; + } + + MvCodeReader.MV_CODEREADER_DEVICE_INFO stDevInfo; // 通用设备信息 + Int32 nDevIndex = -1; + // ch:打印设备信息 | en:Print device info + for (Int32 i = 0; i < stDevList.nDeviceNum; i++) + { + stDevInfo = (MvCodeReader.MV_CODEREADER_DEVICE_INFO)Marshal.PtrToStructure(stDevList.pDeviceInfo[i], typeof(MvCodeReader.MV_CODEREADER_DEVICE_INFO)); + + if (MvCodeReader.MV_CODEREADER_GIGE_DEVICE == stDevInfo.nTLayerType) + { + MvCodeReader.MV_CODEREADER_GIGE_DEVICE_INFO stGigEDeviceInfo = (MvCodeReader.MV_CODEREADER_GIGE_DEVICE_INFO)MvCodeReader.ByteToStruct(stDevInfo.SpecialInfo.stGigEInfo, typeof(MvCodeReader.MV_CODEREADER_GIGE_DEVICE_INFO)); + uint nIp1 = ((stGigEDeviceInfo.nCurrentIp & 0xff000000) >> 24); + uint nIp2 = ((stGigEDeviceInfo.nCurrentIp & 0x00ff0000) >> 16); + uint nIp3 = ((stGigEDeviceInfo.nCurrentIp & 0x0000ff00) >> 8); + uint nIp4 = (stGigEDeviceInfo.nCurrentIp & 0x000000ff); + // Console.WriteLine("\n" + i.ToString() + ": [GigE] User Define Name : " + stGigEDeviceInfo.chUserDefinedName); + string ip = ((stGigEDeviceInfo.nCurrentIp & 0xff000000) >> 24) + "." + ((stGigEDeviceInfo.nCurrentIp & 0x00ff0000) >> 16) + "." + ((stGigEDeviceInfo.nCurrentIp & 0x0000ff00) >> 8) + "." + (stGigEDeviceInfo.nCurrentIp & 0x000000ff); + string ipStr = nIp1 + "." + nIp2 + "." + nIp3 + "." + nIp4; + if (ipStr == LinerScannerIp) + { + Console.WriteLine("device IP :" + ipStr); + nDevIndex = i; + } + } + } + if (nDevIndex < 0) return; + stDevInfo = (MvCodeReader.MV_CODEREADER_DEVICE_INFO)Marshal.PtrToStructure(stDevList.pDeviceInfo[nDevIndex], typeof(MvCodeReader.MV_CODEREADER_DEVICE_INFO)); + + // ch:创建设备 | en:Create device + nRet = device.MV_CODEREADER_CreateHandle_NET(ref stDevInfo); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Create device failed:{0:x8}", nRet); + break; + } + + // ch:打开设备 | en:Open device + nRet = device.MV_CODEREADER_OpenDevice_NET(); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Open device failed:{0:x8}", nRet); + break; + } + + + // ch:注册回调函数 | en:Register image callback + ImageCallback = new MvCodeReader.cbOutputEx2delegate(LinerImageCallbackFunc); + nRet = device.MV_CODEREADER_RegisterImageCallBackEx2_NET(ImageCallback, IntPtr.Zero); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Register image callback failed!"); + break; + } + + // ch:开启抓图 || en: start grab image + nRet = device.MV_CODEREADER_StartGrabbing_NET(); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Start grabbing failed:{0:x8}", nRet); + break; + } + + Console.WriteLine("Press enter to exit"); + Console.ReadLine(); + + // ch:停止抓图 | en:Stop grabbing + nRet = device.MV_CODEREADER_StopGrabbing_NET(); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Stop grabbing failed{0:x8}", nRet); + break; + } + + // ch:关闭设备 | en:Close device + nRet = device.MV_CODEREADER_CloseDevice_NET(); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Close device failed{0:x8}", nRet); + break; + } + + // ch:销毁设备 | en:Destroy device + nRet = device.MV_CODEREADER_DestroyHandle_NET(); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Destroy device failed:{0:x8}", nRet); + break; + } + } while (false); + + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + // ch:销毁设备 | en:Destroy device + nRet = device.MV_CODEREADER_DestroyHandle_NET(); + if (MvCodeReader.MV_CODEREADER_OK != nRet) + { + Console.WriteLine("Destroy device failed:{0:x8}", nRet); + } + } + + } + + #region 判断字符编码 + /// + /// 判断字符编码 + /// + /// + /// + public static bool IsTextUTF8(byte[] inputStream) + { + int encodingBytesCount = 0; + bool allTextsAreASCIIChars = true; + + for (int i = 0; i < inputStream.Length; i++) + { + byte current = inputStream[i]; + + if ((current & 0x80) == 0x80) + { + allTextsAreASCIIChars = false; + } + // First byte + if (encodingBytesCount == 0) + { + if ((current & 0x80) == 0) + { + // ASCII chars, from 0x00-0x7F + continue; + } + + if ((current & 0xC0) == 0xC0) + { + encodingBytesCount = 1; + current <<= 2; + + // More than two bytes used to encoding a unicode char. + // Calculate the real length. + while ((current & 0x80) == 0x80) + { + current <<= 1; + encodingBytesCount++; + } + } + else + { + // Invalid bits structure for UTF8 encoding rule. + return false; + } + } + else + { + // Following bytes, must start with 10. + if ((current & 0xC0) == 0x80) + { + encodingBytesCount--; + } + else + { + // Invalid bits structure for UTF8 encoding rule. + return false; + } + } + } + if (encodingBytesCount != 0) + { + // Invalid bits structure for UTF8 encoding rule. + // Wrong following bytes count. + return false; + } + // Although UTF8 supports encoding for ASCII chars, we regard as a input stream, whose contents are all ASCII as default encoding. + return !allTextsAreASCIIChars; + } + + #endregion + + + } +} diff --git a/Aucma.Core.DoorFoam/Startup.cs b/Aucma.Core.DoorFoam/Startup.cs index 2be9db94..7d079f45 100644 --- a/Aucma.Core.DoorFoam/Startup.cs +++ b/Aucma.Core.DoorFoam/Startup.cs @@ -63,10 +63,10 @@ namespace Aucma.Core.DoorFoam AddServices(services); //ɨ - services.AddScannerSetup(); + // services.AddScannerSetup(); // - services.AddJobSetup(); + // services.AddJobSetup(); //PLC services.AddPlcSetup(); //ֱ֧ȫ :֧ System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030") @@ -89,7 +89,7 @@ namespace Aucma.Core.DoorFoam /// /// /// - public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter, IScannerService scannerService, IRunPlcService runPlcService) + public void Configure(IApplicationBuilder app, IRunPlcService runPlcService) { // ʹþ̬ļ app.UseStaticFiles(); @@ -97,10 +97,10 @@ namespace Aucma.Core.DoorFoam //app.UseAuthorization(); // QuartzNetJobȷ - app.UseQuartzJobMildd(tasksQzService, schedulerCenter); + // app.UseQuartzJobMildd(tasksQzService, schedulerCenter); //ɨ - app.UseScannerMildd(scannerService); + //app.UseScannerMildd(scannerService); //PLC app.UsePlcMildd(runPlcService); } diff --git a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs index 43864991..39eee1d0 100644 --- a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs @@ -12,6 +12,7 @@ using Aucma.Core.Scanner; using System.Linq; using Aucma.Core.HwPLc; using System.Windows.Threading; +using System.Threading.Tasks; namespace Aucma.Core.DoorFoam.ViewModels { @@ -33,6 +34,8 @@ namespace Aucma.Core.DoorFoam.ViewModels timer.Start(); init(); + + InitHikRobot(); } public void init() { @@ -441,6 +444,29 @@ namespace Aucma.Core.DoorFoam.ViewModels } #endregion + #region 开启海康扫码器 + public void InitHikRobot() + { + try + { + + Task.Run(() => + { + Thread.Sleep(2000); + //MvCodeHelper1.DeviceListAcq();//获取创建设备 + // MvCodeHelper1.StartGrab(); // 开启触发扫码接收数据 + Business.MvCodeHelper.Liner(); + }); + + } + catch (Exception ex) + { + //MvCodeHelper.CloseAllDevice(); + InitHikRobot(); + } + } + #endregion + public string _currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); public string CurrentDateTime { diff --git a/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs index 13d89fcc..d066c02b 100644 --- a/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs +++ b/Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs @@ -9,24 +9,16 @@ using System.Threading.Tasks; using System.Windows.Media; using Admin.Core.IService; using Microsoft.Extensions.DependencyInjection; -using Admin.Core.Model.ViewModels; using System.Collections.ObjectModel; -using Aucma.Core.DoorFoam.Models; using Admin.Core.Model; -using Castle.Core.Internal; -using Aucma.Core.Scanner; -using Admin.Core.Service; using Admin.Core.IRepository; -using Admin.Core.Repository; using Admin.Core.Common; using log4net; using System.Collections; -using System.Windows.Documents; -using NPOI.SS.Formula.Functions; -using Microsoft.Extensions.FileSystemGlobbing.Internal; using System.Text.RegularExpressions; using System.Windows.Controls; using System.Threading; +using Aucma.Core.DoorFoam.Business; namespace Aucma.Core.DoorFoam.ViewModels { @@ -34,12 +26,14 @@ namespace Aucma.Core.DoorFoam.ViewModels { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(RealTimePageViewModel)); protected readonly IProductPlanInfoServices? _productPlanInfoServices; + protected readonly IBaseOrderInfoServices? _baseOrderInfoServices; protected readonly IDoorMateHistoryServices? _doorMateHistoryServices; protected readonly IPrintBarCodeServices? _printBarCodeServices; protected readonly ISysUserInfoRepository _sysUserInfoRepository; private ObservableCollection listItems = new ObservableCollection(); public RealTimePageViewModel() { + _baseOrderInfoServices = App.ServiceProvider.GetService(); _productPlanInfoServices = App.ServiceProvider.GetService(); _doorMateHistoryServices = App.ServiceProvider.GetService(); _sysUserInfoRepository = App.ServiceProvider.GetService(); @@ -48,7 +42,7 @@ namespace Aucma.Core.DoorFoam.ViewModels MvCodeHelper.DoorReceiveCodeDelegateEvent += OnLoadPlanData; - OnLoadPlanData("B24010181060282920001"); + //OnLoadPlanData("B24010181060282920001"); Task.Run(() => { @@ -241,11 +235,12 @@ namespace Aucma.Core.DoorFoam.ViewModels string productLineCode = Appsettings.app("StationInfo", "ProductlineCode"); if (string.IsNullOrEmpty(code)) return; var plan = _productPlanInfoServices.QueryAsync(d => d.ProductLineCode == stationCode && d.PlanAmount > d.CompleteAmount).Result; + //var plan = _baseOrderInfoServices.QueryAsync().Result; if (plan == null) return; var obj = _printBarCodeServices.FirstAsync(d => d.MaterialBarcode == code).Result; if (obj == null) return; - //string materialCode = this.SubString(code); - ProductPlanInfo stationPlan = plan.FirstOrDefault(d => d.OrderCode == obj.OrderCode); + //string materialCode = "11239723"; + ProductPlanInfo stationPlan = plan.FirstOrDefault(d =>d.OrderCode == obj.OrderCode); if (stationPlan == null) return; DoorMateHistory model = new DoorMateHistory(); @@ -288,10 +283,17 @@ namespace Aucma.Core.DoorFoam.ViewModels model.PlantCode = station.PlantCode; model.StationCode = station.StationCode; int result = _doorMateHistoryServices.AddAsync(model).Result; - if (result <= 0) + if (result <= 0) + { PrintMessageToListBox($"箱门匹配记录异常！扫描箱体条码：【{code}】"); + log.Error($"箱门匹配记录异常！扫描箱体条码：【{code}】"); + } else + { PrintMessageToListBox($"箱门匹配成功！扫描箱体条码：【{code}】"); + log.Info($"箱门匹配成功！扫描箱体条码：【{code}】"); + } + } } #endregion diff --git a/Aucma.Core.DoorFoam/appsettings.json b/Aucma.Core.DoorFoam/appsettings.json index 5e6a15c8..207577e8 100644 --- a/Aucma.Core.DoorFoam/appsettings.json +++ b/Aucma.Core.DoorFoam/appsettings.json @@ -108,7 +108,7 @@ "TriggerType": 1, "IntervalSecond": 5, "CycleRunTimes": 1, - "IsStart": true, + "IsStart": false, "JobParams": null, "DelFlag": false, "CreateBy": "admin", @@ -195,7 +195,7 @@ "ScannerServer": [ { "Id": 1, - "Ip": "192.168.1.19", + "Ip": "10.10.92.134", "Name": "扫码器1" } ], diff --git a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml index d89c4d8c..01337351 100644 --- a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml +++ b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml @@ -41,38 +41,45 @@ - + - +