liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Browse Source
dev
liuwf 11 months ago
parent 13f0eb9738 82542aaaec
commit 814016ae41
48 changed files with 557 additions and 130 deletions
Show Stats Download Patch File Download Diff File

76
Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
Unescape Escape View File

@ -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": [

3
Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
Unescape Escape View File

@ -5,12 +5,13 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\</NuGetPackageFolders>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\admin\.nuget\packages\" />
<SourceRoot Include="D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props')" />

2
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
6595f7ba4e0a05ad222d8d47acb1a5dea054ac8fd23612b0d9b2c1a982a2210f
a93bec2e5ffdf4970a870b00ef63076582f8814a81b11aac5793b179560f6a09

BIN
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
View File

Binary file not shown.

7
Admin.Core.Api/obj/project.assets.json
Unescape Escape View File

@ -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": [

2
Admin.Core.Api/obj/project.nuget.cache
Unescape Escape View File

@ -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": [

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
b599770ee407fe896e0bee7dfc7103f5198f20a80e32c8697c91799b70e146ca
7ad81a09147b0478aa0b50225f58a9581fb29a1452bd9a328e249c4af9c9ba8b

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
6de8b0dcfc48b128033fd3bbdc30713db3e9facb0ff8080ceed7668b8701a863
2fc7d476902952a95d287f6f5b416b2d2e0c4d9b481a5e49690d0af6f465138c

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
dffc6a08829f7f9594af6c1484816eceabd35a3c35bbbd569549b474aba6e447
d780f4c71d7f81730d6e88e43ff8d26d1f8e15b705f157a4bf086caa5e7da499

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
c439f0743b2ab061130800af9e199d9d748586e7dd45924dd104324c65f5343c
8726b4a34e466084643a48e8c0039a17689dbbba68bb056ab0191f984716dde6

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
b15ed3d62aa91c5139d415717d5d02b2369ed1631e05498b732534010ba56d6f
72f20f6cf98a472ebf4c20b336a615ec584766bd52e85cd9501f3b4e781988db

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
b960962ff5ee8813163b448cfec6d88ec854758ac69b93268364326dae441531
58e5bcaec14d01e659427d2a8c0b1fbc2e0da050bb91443cceff81b9cb2a3e6c

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
3c40f91aa5e16ca4d3191d787932e032eb151c5fa525bf72ef5053c26bc878bd
1ec56689cad54c12209e5fbd483faa339ac415e2614a8fd6b45ec357a392a616

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
ffe85bc2871e10e4f4deabf6433e768a4eb932a7d3809316277215a444c9f5c2
0233e45d9021e3993970f80743611620290253700f9f88fdb16a4673a7d9f624

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
fe7c924978ded9c3cdf0f9f7492dccb0324b897050d32f2dd46ac8439851acac
4639e0ce1dff133705f35aae6cc343d3a434fc547d556f93e46bcf77a8fe9d80

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
a9badd67957e2093975a45f0b8bdf4f368d78415c81f5178dbc72c651233d914
4f26aea112ddb2e1ceead1b404f91a11042202d3d8738b7674a88a5c5fae49b0

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
41f96c06a6699d16272c9fa5c9313083b66b4d92c03c2e18edcec976d22fe73a
f7af35947834bb2b8700b1aa87f9fe428cf89bd259aefe95cb2c632699945ffb

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
b257f613a7d6a7d318c3b07b1b243b35b2419d441e95c4ece51dc9f3c406b9c8
357d4cf1da9d0baaf00ea24891148cc7f0ef3028d39279eea9f552730b5fa818

8
Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
Unescape Escape View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
@ -78,6 +78,12 @@
<ProjectReference Include="..\Aucma.Core.Palletiz\Aucma.Core.Palletiz.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="MvCodeReaderSDK.Net">
<HintPath>..\dll\MvCodeReaderSDK.Net.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Update="Views\FoamMachinesPageView.xaml.cs">
<SubType>Code</SubType>

79
Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
Unescape Escape View File

@ -159,46 +159,55 @@ namespace Aucma.Core.DoorFoam.Business
/// <param name="obj_1"></param>
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}");
}
}

284
Aucma.Core.DoorFoam/Business/MvCodeHelper.cs
Unescape Escape View File

@ -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<ScannerModel> allScanners = Appsettings.app<ScannerModel>("ScannerServer").ToList();
// 内胆扫码器ip
private static string LinerScannerIp = allScanners.First(x => x.Name == "扫码器1").Ip;
#region 委托事件
#region 门体匹配委托事件
#region 门体匹配扫码信息刷新
/// <summary>
/// 门体匹配扫码信息刷新
/// </summary>
/// <param name="Code1"></param>
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 判断字符编码
/// <summary>
/// 判断字符编码
/// </summary>
/// <param name="inputStream"></param>
/// <returns></returns>
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
}
}

10
Aucma.Core.DoorFoam/Startup.cs
Unescape Escape View File

@ -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
/// </summary>
/// <param name="app"></param>
/// <param name="env"></param>
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);
}

26
Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -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
{

51
Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs
Unescape Escape View File

@ -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<dynamic> listItems = new ObservableCollection<dynamic>();
public RealTimePageViewModel()
{
_baseOrderInfoServices = App.ServiceProvider.GetService<IBaseOrderInfoServices>();
_productPlanInfoServices = App.ServiceProvider.GetService<IProductPlanInfoServices>();
_doorMateHistoryServices = App.ServiceProvider.GetService<IDoorMateHistoryServices>();
_sysUserInfoRepository = App.ServiceProvider.GetService<ISysUserInfoRepository>();
@ -48,7 +42,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
MvCodeHelper.DoorReceiveCodeDelegateEvent += OnLoadPlanData;
OnLoadPlanData("B24010181060282920001");
//OnLoadPlanData("B24010181060282920001");
Task.Run(() =>
{
@ -241,12 +235,26 @@ 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;
if (plan == null) return;
//var plan = _baseOrderInfoServices.QueryAsync().Result;
if (plan == null)
{
Console.WriteLine("未查询到计划信息");
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);
if (stationPlan == null) return;
if (obj == null)
{
Console.WriteLine("未查询到条码打印信息");
return;
}
//string materialCode = "11239723";
ProductPlanInfo stationPlan = plan.FirstOrDefault(d =>d.OrderCode == obj.OrderCode);
if (stationPlan == null)
{
Console.WriteLine($"未查询到该条码订单信息；条码【{code}】");
log.Error($"未查询到该条码订单信息；条码【{code}】");
return;
}
DoorMateHistory model = new DoorMateHistory();
if (planInfoDataGrid.Count() == 0) model.ObjId = 1;
@ -258,13 +266,13 @@ namespace Aucma.Core.DoorFoam.ViewModels
model.MaterialName = stationPlan.MaterialName;
model.ScanTime = DateTime.Now;
SaveMateHistory(code,obj, productLineCode, plan, model);
Console.WriteLine($"箱门匹配信息记录成功！");
model.MaterialName = this.FormatMaterialType(stationPlan.MaterialName);
model.ObjId = i+1;
planInfoDataGrid.Insert(0, model);
InitEveryDayMethodAsync();//刷新型号统计图表
Console.WriteLine($"箱门匹配信息记录成功！刷新型号统计图表");
}
#region 记录历史
@ -288,10 +296,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

4
Aucma.Core.DoorFoam/appsettings.json
Unescape Escape View File

@ -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.121", //测试：10.10.92.121
"Name": "扫码器1"
}
],

45
Aucma.Core.Palletiz/Views/HandPalletizView.xaml
Unescape Escape View File

@ -41,38 +41,45 @@
<TextBox x:Name="txtBarCode" FontSize="20" Foreground="white" Height="50" Width="400" Style="{x:Null}" Margin="20 0" />
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="所属仓库:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<TextBlock Text="所属仓库:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<Button x:Name="btn_A" Content="A 库" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Cursor="Hand" Click="btn_A_Click" />
<Button x:Name="btn_B" Content="B 库" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_B_Click"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="目的货道:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<Button x:Name="btn_space1" Content="1" FontSize="18" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="0 0 10 0" Click="btn_space1_Click"/>
<Button x:Name="btn_space2" Content="2" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space2_Click"/>
<Button x:Name="btn_space3" Content="3" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space3_Click"/>
<Button x:Name="btn_space4" Content="4" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space4_Click"/>
<Button x:Name="btn_space5" Content="5" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space5_Click"/>
<Button x:Name="btn_space6" Content="6" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space6_Click"/>
</StackPanel>
<UniformGrid Grid.Row="3" VerticalAlignment="Center" Margin="50,0,0,0">
<StackPanel Width="500">
<TextBlock Text="目的货道:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
</StackPanel>
<StackPanel Width="500">
<Button x:Name="btn_space1" Content="1" FontSize="18" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="0 0 10 0" Click="btn_space1_Click"/>
<Button x:Name="btn_space2" Content="2" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space2_Click"/>
<Button x:Name="btn_space3" Content="3" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space3_Click"/>
<Button x:Name="btn_space4" Content="4" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space4_Click"/>
<Button x:Name="btn_space5" Content="5" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space5_Click"/>
<Button x:Name="btn_space6" Content="6" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space6_Click"/>
<Button x:Name="btn_space7" Content="7" FontSize="18" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="45" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space6_Click"/>
</StackPanel>
</UniformGrid>
<StackPanel Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="货道分流:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<Button x:Name="btn_left" Content="左 道" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_left_Click" >
</Button>
<Button x:Name="btn_right" Content="右 道" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_right_Click">
</Button>
<Button x:Name="btn_left" Content="左 道" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_left_Click" />
<Button x:Name="btn_right" Content="右 道" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_right_Click"/>
</StackPanel>
<StackPanel Grid.Row="5" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="转向方向:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<Button Content="正 向" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_left_Click" />
<Button Content="逆 向" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_right_Click"/>
</StackPanel>
<StackPanel Grid.Row="5" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="转向角度:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<Button x:Name="btn_range90" Content="90度" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_range90_Click" />
<Button x:Name="btn_range180" Content="180度" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_range180_Click"/>
<Button x:Name="btn_range270" Content="270度" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_range270_Click" />
<Button x:Name="btn_range90" Content="90°" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_range90_Click" />
<Button x:Name="btn_range180" Content="180°" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_range180_Click"/>
</StackPanel>
<StackPanel Grid.Row="6" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="提示信息:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
<TextBlock Text="{Binding MsgTxt}" Foreground="{Binding MsgColor,Mode=TwoWay}" FontWeight="Bold" FontSize="20" Width="400" Height="35"/>
</StackPanel>
<StackPanel Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 10 0">
<StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 10 0">
<Button Content="保 存" FontSize="20" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
<Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" Click="Button_Click_1" />
</StackPanel>

6
Aucma.Core.Palletiz/Views/HandPalletizView.xaml.cs
Unescape Escape View File

@ -150,7 +150,7 @@ namespace Aucma.Core.Palletiz.Views
{
btn_range90.Background = Brushes.Lime;
btn_range180.Background = Brushes.DarkCyan;
btn_range270.Background = Brushes.DarkCyan;
//btn_range270.Background = Brushes.DarkCyan;
range = 90;
}
@ -158,7 +158,7 @@ namespace Aucma.Core.Palletiz.Views
{
btn_range90.Background = Brushes.DarkCyan;
btn_range180.Background = Brushes.Lime;
btn_range270.Background = Brushes.DarkCyan;
// btn_range270.Background = Brushes.DarkCyan;
range = 180;
}
@ -166,7 +166,7 @@ namespace Aucma.Core.Palletiz.Views
{
btn_range90.Background = Brushes.DarkCyan;
btn_range180.Background = Brushes.DarkCyan;
btn_range270.Background = Brushes.Lime;
//btn_range270.Background = Brushes.Lime;
range = 270;
}
#endregion

14
Aucma.Core.Scanner/Helper/MvCodeHelper.cs
Unescape Escape View File

@ -14,19 +14,7 @@ namespace Aucma.Core.Scanner
{
public class MvCodeHelper
{
#region 门体匹配委托事件
#region 门体匹配扫码信息刷新
/// <summary>
/// 门体匹配扫码信息刷新
/// </summary>
/// <param name="Code1"></param>
public delegate void DoorReceiveCodeDelegate(string code);
public static event DoorReceiveCodeDelegate DoorReceiveCodeDelegateEvent;
#endregion
#endregion
#region 委托事件

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")]
[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("HwControlLib")]
[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
dae99803a2b8dd8cf4e00f8d697b76bdddce480c657b26637da592321a63c71f
a218c3aef6d49bc3835c2cb2557ea57f8a9ac0bbe4ada38d159f22eea471c672

BIN
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache
View File

Binary file not shown.

4
HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
Unescape Escape View File

@ -13,8 +13,12 @@
"packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
"outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\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": [

3
HwControlLib/obj/HwControlLib.csproj.nuget.g.props
Unescape Escape View File

@ -5,11 +5,12 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\</NuGetPackageFolders>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\admin\.nuget\packages\" />
<SourceRoot Include="D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
</ItemGroup>
</Project>

7
HwControlLib/obj/project.assets.json
Unescape Escape View File

@ -8,7 +8,8 @@
"net6.0-windows7.0": []
},
"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",
@ -19,8 +20,12 @@
"packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
"outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\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": [

2
HwControlLib/obj/project.nuget.cache
Unescape Escape View File

@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "horyZh3yrrV/Wx/ob3RmZ4jVsznw7JeDlczy9SVraJOxYtrdNCFtGJURBxDUIslzvFW/ls//Q1DJ8T0khoQRUg==",
"dgSpecHash": "Lldp0WwKv+WofUzsqhZJ/oOT3RuTSOiglpZojOboMh6lba8xJ+wNaDv46uD9G2F52iYt2kUp+s3r14ZwXLdqWw==",
"success": true,
"projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"expectedPackageFiles": [],

Write Preview
Loading…
Cancel
Save