From ed5d6187993f903addd4bd2193113d5dc691ff7f Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 29 Mar 2024 16:01:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?change-=E5=88=86=E5=9E=9B=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +-
...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.EventBus.AssemblyInfo.cs | 2 +-
...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.Extensions.AssemblyInfo.cs | 2 +-
...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +-
...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.IRepository.AssemblyInfo.cs | 2 +-
....Core.IRepository.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.IService.AssemblyInfo.cs | 2 +-
...min.Core.IService.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +-
.../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
...Admin.Core.RealTimeService.AssemblyInfo.cs | 2 +-
...e.RealTimeService.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.Repository.AssemblyInfo.cs | 2 +-
...n.Core.Repository.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +-
...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +-
...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +-
.../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Aucma.Core.Palletiz.csproj | 2 +-
.../ViewModels/IndexPageViewModel.cs | 97 ++++++++-----------
Aucma.Core.Palletiz/Views/MainWindow.xaml | 2 +-
Aucma.Core.Palletiz/appsettings.json | 2 +-
40 files changed, 80 insertions(+), 119 deletions(-)
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 c469efc7..2aa8fa0f 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 ab4ea7e3..b3b30e6b 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 @@
-87b97d6c98969839e436c60fdc3421de8c552f08c2560e1a3506756349f059ca
+3c08b2a6f95957043123cba0d01dcd1675663fc7
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
index 124dffb6..e43b7078 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Common
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Common\
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
index 0182450b..a952d577 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 8d094174..257bfd4c 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 @@
-94521fa37ccae9da584ae5e86109853076c87d0aaf3b728988e51b5bc39def10
+2af60005099f8dd0481f84ac0dfadb89cc4b6f1d
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
index 05b5680f..987e6af9 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.EventBus
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.EventBus\
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
index 552756dc..93109f44 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
index 6088a9dd..22c8e621 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 @@
-1a85c36c93195e02d5a49ae941a1820e517b1c55eb7754d95d708227a011967f
+790ffd47e6e46a3c8a83558ad3550154a5c81377
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
index 0aabde02..75d65c67 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Extensions
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Extensions\
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
index 13187cf1..7a3f49c3 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 368ebb45..4390da2f 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 @@
-06b9d01697118aa7a5c067a4ed4b0a97698bf8dc79c742ff3e7c7766490782da
+7d60a94dd38c10522cbfe4a021ccb6e9c5da0354
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
index 73c91585..a3871f56 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,5 +1,3 @@
is_global = true
build_property.RootNamespace = Admin.Core.FrameWork
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\
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 b30a1107..d6ce58a3 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 fdb0bd47..7f17d033 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 @@
-b0c2c29c02c77bb6467ff1ba47c4172777e8b9aec37b8342238d162cb04a0157
+80bb097f76aa594dc58289065a284d1acbd8bdff
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
index 45c5ccf7..7d227ef6 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IRepository
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IRepository\
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
index 4065c79e..e0cda4ad 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 3289f470..d5703477 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 @@
-c94077e4a0c8b84c063576bac27f1f3a9262ce83e37f421e82ee10b293c2b66e
+51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
index b4c8c9fc..7ccb1e1e 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IService
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IService\
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
index e7224d28..98e3cd85 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 d48891dd..84a57232 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 @@
-6afd04c8bfb0e354b0543d656eed46dacc31648edd00c8f90420884218ca8f4a
+ef9752cf3f9e33d53832c154eeba975830dced91
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
index b49210f4..0b5bdcb9 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Model
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Model\
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
index b19792b5..d49abd81 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 0242da79..d77b8cba 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 @@
-9771f5d2dc632a8ee6d657205f28805a84fffd7a1dfc02caabb7880fd5fd37bb
+0868e6bde5b49a65a126b91d794e990427a11761
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
index 8f33dc40..6a8a8ca9 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.RealTimeService
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\
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 2f3054b4..ec5c5695 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 098a22ab..ba9c706f 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 @@
-80a5a4b20c7c11950e6041527348852d63a320b24b0a365d4d09b2bfb4dc3c9b
+046606c52f7e20e88e6dd5ffc01e33664c4b9ff8
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
index fda551fc..567ae76f 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Repository
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Repository\
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
index 07acefa6..80f512b2 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 24751247..17b49c29 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 @@
-683bd585b7172b3c819f4847947eaf3b0cf8c228d1707cd24393bf585c096173
+dbec6c73777a8ebf7006f00f1928199755951ac1
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
index 7fe89e3c..a8331c60 100644
--- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Serilog.Es
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Serilog.Es\
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
index 9afc9455..ec38a905 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 c5b86619..5904500d 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 @@
-a13c5b5d999a9ffa4524dd8112071bede87cef1ae9dde3b78e3bcdd650215a21
+ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
index 8cc143a5..ade53e61 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Service
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Service\
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
index 844e06d4..83f017e2 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+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[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 99922c5d..a5578479 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 @@
-2c398f4612cf5ebc7de26de93992260233e8a8d28cdca2fdf898eb08e59778c6
+da4240456d30e56fa6c5e71babf5565adb3e1436
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
index 88638f9a..aa57dd8c 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Tasks
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\
diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
index f3c45321..e6bbe75b 100644
--- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
+++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
@@ -71,11 +71,11 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
- <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Admin.Core.Extensions\Admin.Core.Extensions.csproj" />
+ <ProjectReference Include="..\Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
index 026b4e44..48f294cf 100644
--- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
@@ -6,8 +6,8 @@ using Aucma.Core.Palletiz.Models;
using Microsoft.Extensions.DependencyInjection;
using System.Collections.ObjectModel;
using System.Linq;
-using GalaSoft.MvvmLight;
using Aucma.Core.Palletiz.Views;
+using CommunityToolkit.Mvvm.ComponentModel;
/*
* 成品分垛入库首页信息
@@ -15,7 +15,7 @@ using Aucma.Core.Palletiz.Views;
*/
namespace Aucma.Core.Palletiz.ViewModels
{
- internal class IndexControlViewModel : ViewModelBase
+ internal class IndexControlViewModel : ObservableObject
{
private InStoreBusiness inStoreBusiness;
@@ -51,65 +51,49 @@ namespace Aucma.Core.Palletiz.ViewModels
public string ProductSNCode
{
get { return this.productSNCode; }
- set
- {
- productSNCode = value;
- RaisePropertyChanged(nameof(ProductSNCode));
- }
+ set => SetProperty(ref productSNCode, value);
+
}
public string productModel = string.Empty;
public string ProductModel
{
get { return this.productModel; }
- set
- {
- productModel = value;
- RaisePropertyChanged(nameof(ProductModel));
- }
+ set => SetProperty(ref productModel, value);
+
}
public string orderCode = string.Empty;
public string OrderCode
{
get { return this.orderCode; }
- set
- {
- orderCode = value;
- RaisePropertyChanged(nameof(OrderCode));
- }
+ set => SetProperty(ref orderCode, value);
+
+
}
public string productScanTime = string.Empty;
public string ProductScanTime
{
get { return this.productScanTime; }
- set
- {
- productScanTime = value;
- RaisePropertyChanged(nameof(ProductScanTime));
- }
+
+ set => SetProperty(ref productScanTime, value);
}
public string msg = string.Empty;
public string Msg
{
get { return this.msg; }
- set
- {
- msg = value;
- RaisePropertyChanged(nameof(Msg));
- }
+ set => SetProperty(ref msg, value);
+
}
public string inStoreAmount = "入库数量:";
public string InStoreAmount
{
get { return this.inStoreAmount; }
- set
- {
- inStoreAmount = value;
- RaisePropertyChanged(nameof(InStoreAmount));
- }
+ set => SetProperty(ref inStoreAmount, value);
+
+
}
public System.Windows.Controls.UserControl _content;
@@ -117,11 +101,10 @@ namespace Aucma.Core.Palletiz.ViewModels
public System.Windows.Controls.UserControl InStoreTaskContent
{
get { return this._content; }
- set
- {
- _content = value;
- RaisePropertyChanged(nameof(InStoreTaskContent));
- }
+ set => SetProperty(ref _content, value);
+
+
+
}
/// <summary>
@@ -132,7 +115,8 @@ namespace Aucma.Core.Palletiz.ViewModels
public ObservableCollection<BaseSpaceInfo> AreaA_SpaceInfo
{
get { return _areaA_SpaceInfo; }
- set { _areaA_SpaceInfo = value; RaisePropertyChanged(nameof(AreaA_SpaceInfo)); }
+ set => SetProperty(ref _areaA_SpaceInfo, value);
+
}
/// <summary>
@@ -143,7 +127,8 @@ namespace Aucma.Core.Palletiz.ViewModels
public ObservableCollection<BaseSpaceInfo> AreaB_SpaceInfo
{
get { return _areaB_SpaceInfo; }
- set { _areaB_SpaceInfo = value; RaisePropertyChanged(nameof(AreaB_SpaceInfo)); }
+ set => SetProperty(ref _areaB_SpaceInfo, value);
+
}
#endregion
@@ -197,23 +182,23 @@ namespace Aucma.Core.Palletiz.ViewModels
}
- var info2 = inStoreBusiness.GetBaseSpaceinfos("A");
- info2 = info2.OrderBy(x => x.ObjId).ToList();
- if (info2 != null)
- {
- App.Current.Dispatcher.BeginInvoke((Action)(() =>
- {
- if (spaceItemsB.Count > 0)
- {
- spaceItemsB.Clear();
- }
- foreach (var item in info2)
- {
- spaceItemsB.Add(item);
- }
- AreaB_SpaceInfo = spaceItemsB;
- }));
- }
+ //var info2 = inStoreBusiness.GetBaseSpaceinfos("A");
+ //info2 = info2.OrderBy(x => x.ObjId).ToList();
+ //if (info2 != null)
+ //{
+ // App.Current.Dispatcher.BeginInvoke((Action)(() =>
+ // {
+ // if (spaceItemsB.Count > 0)
+ // {
+ // spaceItemsB.Clear();
+ // }
+ // foreach (var item in info2)
+ // {
+ // spaceItemsB.Add(item);
+ // }
+ // AreaB_SpaceInfo = spaceItemsB;
+ // }));
+ //}
}
}
diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml
index e2383798..8bdda27d 100644
--- a/Aucma.Core.Palletiz/Views/MainWindow.xaml
+++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml
@@ -61,7 +61,7 @@
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="实时监控" x:Name="FirstPage" FontSize="20" Height="40" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}" Margin="5 0" />
<Button Content="扫描记录" x:Name="RecordPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RecordPage}" />
- <Button Content="分垛库设置" x:Name="PalletizPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=PalletizPage}" />
+ <!--<Button Content="分垛库设置" x:Name="PalletizPage" FontSize="20" Height="40" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=PalletizPage}" />-->
<Button Content="键 盘" x:Name="TabTip" FontSize="20" Height="40" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" FontSize="20" Height="40" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
<Button Content="退 出" x:Name="Exit" FontSize="20" Height="40" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Width="100" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
diff --git a/Aucma.Core.Palletiz/appsettings.json b/Aucma.Core.Palletiz/appsettings.json
index 65d5a9d8..b11c9809 100644
--- a/Aucma.Core.Palletiz/appsettings.json
+++ b/Aucma.Core.Palletiz/appsettings.json
@@ -197,7 +197,7 @@
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.80", //10.10.92.80
- "Port": 6000
+ "Port": 2015
}
],
"StoreInfo": {
From 6793c09184f7df6d533dcbc6adffec0d49a7236a Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 29 Mar 2024 16:41:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?change=20-=20=E6=9D=A1=E7=A0=81=E7=BB=91?=
=?UTF-8?q?=E5=AE=9A=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?=
=?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Aucma.Core.CodeBinding.csproj | 1 +
Aucma.Core.CodeBinding/Startup.cs | 3 +
Aucma.Core.CodeBinding/appsettings.json | 55 ++++++++++++++++++-
.../DataCollectorFactory.cs | 2 +-
4 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj b/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj
index 499c8941..c722d4c6 100644
--- a/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj
+++ b/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj
@@ -78,6 +78,7 @@
<ItemGroup>
<ProjectReference Include="..\Admin.Core.Extensions\Admin.Core.Extensions.csproj" />
<ProjectReference Include="..\Aucma.Core.BoxFoam\Aucma.Core.BoxFoam.csproj" />
+ <ProjectReference Include="..\Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/Aucma.Core.CodeBinding/Startup.cs b/Aucma.Core.CodeBinding/Startup.cs
index 7ac47453..97613316 100644
--- a/Aucma.Core.CodeBinding/Startup.cs
+++ b/Aucma.Core.CodeBinding/Startup.cs
@@ -8,6 +8,7 @@ using Admin.Core.Repository;
using Admin.Core.Service;
using Admin.Core.Socket;
using Admin.Core.Tasks;
+using Aucma.Core.DataCollector;
using Aucma.Core.RunPlc;
using Aucma.Core.Scanner;
using Aucma.Core.ScannerGun;
@@ -114,6 +115,8 @@ namespace Aucma.Core.CodeBinding
app.UsePlcMildd(runPlcService);
// Socket����ɨ����
app.UseTouchSocketMildd(socket);
+
+ app.UseDataCollectorExtensions();
}
#region ע�����
diff --git a/Aucma.Core.CodeBinding/appsettings.json b/Aucma.Core.CodeBinding/appsettings.json
index 45595cba..e7610a5b 100644
--- a/Aucma.Core.CodeBinding/appsettings.json
+++ b/Aucma.Core.CodeBinding/appsettings.json
@@ -212,6 +212,9 @@
"Name": "sn扫码器"
}
],
+ "StationInfo": {
+ "StationCode": "1010"
+ },
"PLCServer": [
{
"Id": 1,
@@ -219,9 +222,57 @@
"PlcType": "Melsec",
"Enabled": true,
//"IP": "127.0.0.1",
- // "Port": 6000
- "IP": "10.10.92.70",
+ // "Port": 6000
+ "IP": "10.10.92.72",
"Port": 2014
+ },
+ {
+ "Id": 2,
+ "EquipName": "ShellStore",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.22",
+ "Port": 2015
+ },
+ {
+ "Id": 3,
+ "EquipName": "LinerStore",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.29",
+ "Port": 2015
+ },
+ {
+ "Id": 4,
+ "EquipName": "ShellPreassemble",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.10",
+ "Port": 2015
+ },
+ {
+ "Id": 5,
+ "EquipName": "LinerPreassemble",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.1",
+ "Port": 2015
+ },
+ {
+ "Id": 6,
+ "EquipName": "FoamBack",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.49",
+ "Port": 2015
+ },
+ {
+ "Id": 7,
+ "EquipName": "Palletiz",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.80", //10.10.92.80
+ "Port": 2015
}
],
diff --git a/Aucma.Core.DataCollector/DataCollectorFactory.cs b/Aucma.Core.DataCollector/DataCollectorFactory.cs
index 223f0cad..011ff764 100644
--- a/Aucma.Core.DataCollector/DataCollectorFactory.cs
+++ b/Aucma.Core.DataCollector/DataCollectorFactory.cs
@@ -25,7 +25,7 @@ namespace Aucma.Core.DataCollector
public readonly IRecordDeviceElectricityServices _deviceElectricityServices;
public int AlarmReadTimer = (1000 * 5);
- public int EleReadTimer = (1000 * 20);
+ public int EleReadTimer = (1000 * 5);
public DataCollectorFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices)
{
From 9cbadc5a7e9ce6c9c2190708fbcccec5694232e4 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 29 Mar 2024 18:10:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?change-=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Admin.Core.Socket/TouchSocketService.cs | 4 +++-
Aucma.Core.CodeBinding/appsettings.json | 12 +++++-----
.../ViewModels/MainWindowViewModel.cs | 2 +-
.../ViewModels/StatisticsPageViewModel.cs | 22 +++++++++----------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Admin.Core.Socket/TouchSocketService.cs b/Admin.Core.Socket/TouchSocketService.cs
index d82de4d9..71c1b28c 100644
--- a/Admin.Core.Socket/TouchSocketService.cs
+++ b/Admin.Core.Socket/TouchSocketService.cs
@@ -68,7 +68,7 @@ namespace Admin.Core.Socket
return EasyTask.CompletedTask;
};//有客户端正在连接
service.Connected = (client, e) => { client.Logger.Info($"{client.IP}:{client.Port} 客户端连接成功！目前客户端连接数{service.Count}");
-
+ log.Info($"{client.IP}:{client.Port} 客户端连接成功！目前客户端连接数{service.Count}");
SetProdStoreClientId(client);
return EasyTask.CompletedTask;
@@ -89,6 +89,7 @@ namespace Admin.Core.Socket
try
{
var mes = Encoding.UTF8.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len
+ log.Info("原始报文:"+mes);
//心跳包
if (mes== "heartbeat")
{
@@ -104,6 +105,7 @@ namespace Admin.Core.Socket
}
else
{
+ log.Info("条码报文:" + mes);
ReceiveCodeDelegateEvent?.Invoke(client.IP,mes);
client.Logger.Info($"已从{client.IP}:{client.Port}》接收到信息：{mes}");
}
diff --git a/Aucma.Core.CodeBinding/appsettings.json b/Aucma.Core.CodeBinding/appsettings.json
index e7610a5b..3020bd66 100644
--- a/Aucma.Core.CodeBinding/appsettings.json
+++ b/Aucma.Core.CodeBinding/appsettings.json
@@ -223,7 +223,7 @@
"Enabled": true,
//"IP": "127.0.0.1",
// "Port": 6000
- "IP": "10.10.92.72",
+ "IP": "10.10.92.70",
"Port": 2014
},
{
@@ -232,7 +232,7 @@
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.22",
- "Port": 2015
+ "Port": 2014
},
{
"Id": 3,
@@ -240,7 +240,7 @@
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.29",
- "Port": 2015
+ "Port": 2014
},
{
"Id": 4,
@@ -248,7 +248,7 @@
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.10",
- "Port": 2015
+ "Port": 2014
},
{
"Id": 5,
@@ -256,7 +256,7 @@
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.1",
- "Port": 2015
+ "Port": 2014
},
{
"Id": 6,
@@ -264,7 +264,7 @@
"PlcType": "Melsec",
"Enabled": true,
"IP": "10.10.92.49",
- "Port": 2015
+ "Port": 2014
},
{
"Id": 7,
diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
index 07de3695..61b8647e 100644
--- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
@@ -26,7 +26,7 @@ namespace Aucma.Core.Palletiz.ViewModels
/// <summary>
/// 扫描记录刷新
/// </summary>
- public delegate void RefreshInfo();
+ public delegate Task RefreshInfo();
public static event RefreshInfo? RefreshInfoEvent;
diff --git a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
index 2f4d9643..69cfb168 100644
--- a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
@@ -32,15 +32,15 @@ namespace Aucma.Core.Palletiz.ViewModels
#region 加载DataGrid数据
- private async void LoadData()
+ private async Task LoadData()
{
- //Task.Run(() =>
- //{
+ await Task.Run(() =>
+ {
try
{
- List<RecordInStore> list = await _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.InStoreTime >= DateTime.Today);
+ List<RecordInStore> list = _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.InStoreTime >= DateTime.Today).Result;
if (list != null && list.Count > 0)
{
list.OrderByDescending(x => x.InStoreTime);
@@ -58,7 +58,7 @@ namespace Aucma.Core.Palletiz.ViewModels
Console.WriteLine("" + ex.Message.ToString());
}
- // });
+ });
//MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 });
@@ -84,9 +84,11 @@ namespace Aucma.Core.Palletiz.ViewModels
/// 查询
/// </summary>
[RelayCommand]
- private void ExecQuery(object obj)
+ private async Task ExecQuery(object obj)
{
-
+ await Task.Run(() =>
+ {
+
string result = (string)obj;
List<RecordInStore> list = _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.BarCodeCode.Contains(result)).Result;
if (list != null && list.Count > 0)
@@ -100,11 +102,7 @@ namespace Aucma.Core.Palletiz.ViewModels
});
}
}
-
-
-
-
-
+ });
}
#endregion
}