From 74222333166387c1e0508f8ccaf8347b861649a5 Mon Sep 17 00:00:00 2001
From: yantian yue <306727702@qq.com>
Date: 星期四, 28 十二月 2023 15:43:41 +0800
Subject: [PATCH] 更新
---
YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache | 2
YX/obj/Debug/YX.csproj.AssemblyReference.cache | 0
.vs/slnx.sqlite | 0
YX/bin/Debug/YX.DAL.dll | 0
YX/wt/Frmwt.cs | 119 ++++++++++++++---------------
YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt | 14 +++
YX/obj/Debug/YX.exe | 0
YX.BLL/bin/Debug/YX.DAL.dll | 0
YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache | 0
YX/obj/Debug/YX.csproj.CoreCompileInputs.cache | 2
YX/bin/Debug/YX.Entity.pdb | 0
YX/bin/Debug/YX.DAL.pdb | 0
YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt | 6 +
YX/bin/Debug/YX.Entity.dll | 0
YX.BLL/obj/Debug/YX.BLL.dll | 0
YX/bin/Debug/YX.BLL.pdb | 0
YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache | 2
YX/bin/Debug/YX.exe | 0
YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt | 12 +++
YX/obj/Debug/YX.pdb | 0
YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache | 0
YX.BLL/bin/Debug/YX.DAL.pdb | 0
YX/obj/Debug/YX.csproj.GenerateResource.cache | 0
.vs/YX/v16/.suo | 0
YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
YX.Entity/bin/Debug/YX.Entity.pdb | 0
YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache | 2
YX.BLL/bin/Debug/YX.Entity.pdb | 0
YX.Entity/obj/Debug/YX.Entity.pdb | 0
YX/bin/Debug/YX.pdb | 0
YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache | 0
YX.Entity/bin/Debug/YX.Entity.dll | 0
YX.BLL/obj/Debug/YX.BLL.pdb | 0
YX/bin/Debug/YX.BLL.dll | 0
YX.BLL/bin/Debug/YX.Entity.dll | 0
YX.DAL/obj/Debug/YX.DAL.dll | 0
YX.DAL/bin/Debug/YX.Entity.pdb | 0
YX/obj/Debug/YX.FrmMain.resources | 0
YX.BLL/bin/Debug/YX.BLL.pdb | 0
YX.DAL/obj/Debug/YX.DAL.pdb | 0
YX.DAL/bin/Debug/YX.Entity.dll | 0
.vs/VSWorkspaceState.json | 5
YX/obj/Debug/YX.csproj.FileListAbsolute.txt | 46 +++++++++++
YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt | 16 ++++
YX.DAL/bin/Debug/YX.DAL.pdb | 0
YX.DAL/bin/Debug/YX.DAL.dll | 0
.vs/XY/v16/.suo | 0
YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache | 0
YX.BLL/bin/Debug/YX.BLL.dll | 0
YX.Entity/obj/Debug/YX.Entity.dll | 0
50 files changed, 159 insertions(+), 67 deletions(-)
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 7f658dd..989c935 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,7 +1,8 @@
{
"ExpandedNodes": [
- ""
+ "",
+ "\\YX"
],
- "SelectedNode": "\\YX.sln",
+ "SelectedNode": "\\YX\\wt",
"PreviewInSolutionExplorer": false
}
\ No newline at end of file
diff --git a/.vs/XY/v16/.suo b/.vs/XY/v16/.suo
index 00af182..9bbc387 100644
--- a/.vs/XY/v16/.suo
+++ b/.vs/XY/v16/.suo
Binary files differ
diff --git a/.vs/YX/v16/.suo b/.vs/YX/v16/.suo
index d082cc0..286d746 100644
--- a/.vs/YX/v16/.suo
+++ b/.vs/YX/v16/.suo
Binary files differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index e7858f4..7e368bb 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
Binary files differ
diff --git a/YX.BLL/bin/Debug/YX.BLL.dll b/YX.BLL/bin/Debug/YX.BLL.dll
index 3de7625..ffc9e24 100644
--- a/YX.BLL/bin/Debug/YX.BLL.dll
+++ b/YX.BLL/bin/Debug/YX.BLL.dll
Binary files differ
diff --git a/YX.BLL/bin/Debug/YX.BLL.pdb b/YX.BLL/bin/Debug/YX.BLL.pdb
index bf736ef..556912d 100644
--- a/YX.BLL/bin/Debug/YX.BLL.pdb
+++ b/YX.BLL/bin/Debug/YX.BLL.pdb
Binary files differ
diff --git a/YX.BLL/bin/Debug/YX.DAL.dll b/YX.BLL/bin/Debug/YX.DAL.dll
index 629450b..1269fd7 100644
--- a/YX.BLL/bin/Debug/YX.DAL.dll
+++ b/YX.BLL/bin/Debug/YX.DAL.dll
Binary files differ
diff --git a/YX.BLL/bin/Debug/YX.DAL.pdb b/YX.BLL/bin/Debug/YX.DAL.pdb
index 22535a5..54783c4 100644
--- a/YX.BLL/bin/Debug/YX.DAL.pdb
+++ b/YX.BLL/bin/Debug/YX.DAL.pdb
Binary files differ
diff --git a/YX.BLL/bin/Debug/YX.Entity.dll b/YX.BLL/bin/Debug/YX.Entity.dll
index 5557277..bc16856 100644
--- a/YX.BLL/bin/Debug/YX.Entity.dll
+++ b/YX.BLL/bin/Debug/YX.Entity.dll
Binary files differ
diff --git a/YX.BLL/bin/Debug/YX.Entity.pdb b/YX.BLL/bin/Debug/YX.Entity.pdb
index 064e76c..e2117a5 100644
--- a/YX.BLL/bin/Debug/YX.Entity.pdb
+++ b/YX.BLL/bin/Debug/YX.Entity.pdb
Binary files differ
diff --git a/YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache b/YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache
index 422137b..1df5043 100644
--- a/YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache
+++ b/YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache
Binary files differ
diff --git a/YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache b/YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache
index 2571689..8baac29 100644
--- a/YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache
+++ b/YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-063e96945b5976768b1f948625d250a04dd927f9
+f1488af7a4ae78ef75ccf4483a1edc924086ec16
diff --git a/YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt b/YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt
index 10be274..9ab718e 100644
--- a/YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt
+++ b/YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt
@@ -40,3 +40,19 @@
D:\YX\YX.BLL\obj\Debug\YX.BLL.csproj.CopyComplete
D:\YX\YX.BLL\obj\Debug\YX.BLL.dll
D:\YX\YX.BLL\obj\Debug\YX.BLL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.BLL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.BLL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\EntityFramework.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\EntityFramework.SqlServer.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.Common.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.DAL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.Entity.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.Common.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.DAL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.Entity.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\bin\Debug\YX.Entity.dll.config
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\obj\Debug\YX.BLL.csproj.AssemblyReference.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\obj\Debug\YX.BLL.csproj.CoreCompileInputs.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\obj\Debug\YX.BLL.csproj.CopyComplete
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\obj\Debug\YX.BLL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.BLL\obj\Debug\YX.BLL.pdb
diff --git a/YX.BLL/obj/Debug/YX.BLL.dll b/YX.BLL/obj/Debug/YX.BLL.dll
index 3de7625..ffc9e24 100644
--- a/YX.BLL/obj/Debug/YX.BLL.dll
+++ b/YX.BLL/obj/Debug/YX.BLL.dll
Binary files differ
diff --git a/YX.BLL/obj/Debug/YX.BLL.pdb b/YX.BLL/obj/Debug/YX.BLL.pdb
index bf736ef..556912d 100644
--- a/YX.BLL/obj/Debug/YX.BLL.pdb
+++ b/YX.BLL/obj/Debug/YX.BLL.pdb
Binary files differ
diff --git a/YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache b/YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache
index 2bbc40d..cf373ca 100644
--- a/YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache
+++ b/YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache
Binary files differ
diff --git a/YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt b/YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt
index 34610dd..0457c7b 100644
--- a/YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt
+++ b/YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt
@@ -16,3 +16,9 @@
D:\YX\YX.Common\obj\Debug\YX.Common.csproj.CoreCompileInputs.cache
D:\YX\YX.Common\obj\Debug\YX.Common.dll
D:\YX\YX.Common\obj\Debug\YX.Common.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Common\bin\Debug\YX.Common.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Common\bin\Debug\YX.Common.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Common\obj\Debug\YX.Common.csproj.AssemblyReference.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Common\obj\Debug\YX.Common.csproj.CoreCompileInputs.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Common\obj\Debug\YX.Common.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Common\obj\Debug\YX.Common.pdb
diff --git a/YX.DAL/bin/Debug/YX.DAL.dll b/YX.DAL/bin/Debug/YX.DAL.dll
index 629450b..1269fd7 100644
--- a/YX.DAL/bin/Debug/YX.DAL.dll
+++ b/YX.DAL/bin/Debug/YX.DAL.dll
Binary files differ
diff --git a/YX.DAL/bin/Debug/YX.DAL.pdb b/YX.DAL/bin/Debug/YX.DAL.pdb
index 22535a5..54783c4 100644
--- a/YX.DAL/bin/Debug/YX.DAL.pdb
+++ b/YX.DAL/bin/Debug/YX.DAL.pdb
Binary files differ
diff --git a/YX.DAL/bin/Debug/YX.Entity.dll b/YX.DAL/bin/Debug/YX.Entity.dll
index 5557277..bc16856 100644
--- a/YX.DAL/bin/Debug/YX.Entity.dll
+++ b/YX.DAL/bin/Debug/YX.Entity.dll
Binary files differ
diff --git a/YX.DAL/bin/Debug/YX.Entity.pdb b/YX.DAL/bin/Debug/YX.Entity.pdb
index 064e76c..e2117a5 100644
--- a/YX.DAL/bin/Debug/YX.Entity.pdb
+++ b/YX.DAL/bin/Debug/YX.Entity.pdb
Binary files differ
diff --git a/YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache b/YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache
index f5e894a..2ea8bc0 100644
--- a/YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache
+++ b/YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache
Binary files differ
diff --git a/YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache b/YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache
index 11e50e0..ad595c8 100644
--- a/YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache
+++ b/YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-3c1b321a6877c76b555ad2635925733a7586a2f7
+47a68bdaf8811719fec5c9959ef4e84916412f6f
diff --git a/YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt b/YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt
index 323c7c7..0f08172 100644
--- a/YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt
+++ b/YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt
@@ -34,3 +34,17 @@
D:\YX\YX.DAL\obj\Debug\YX.DAL.csproj.CopyComplete
D:\YX\YX.DAL\obj\Debug\YX.DAL.dll
D:\YX\YX.DAL\obj\Debug\YX.DAL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.DAL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.DAL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\EntityFramework.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\EntityFramework.SqlServer.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.Entity.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.Common.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.Entity.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.Entity.dll.config
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\bin\Debug\YX.Common.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\obj\Debug\YX.DAL.csproj.AssemblyReference.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\obj\Debug\YX.DAL.csproj.CoreCompileInputs.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\obj\Debug\YX.DAL.csproj.CopyComplete
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\obj\Debug\YX.DAL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.DAL\obj\Debug\YX.DAL.pdb
diff --git a/YX.DAL/obj/Debug/YX.DAL.dll b/YX.DAL/obj/Debug/YX.DAL.dll
index 629450b..1269fd7 100644
--- a/YX.DAL/obj/Debug/YX.DAL.dll
+++ b/YX.DAL/obj/Debug/YX.DAL.dll
Binary files differ
diff --git a/YX.DAL/obj/Debug/YX.DAL.pdb b/YX.DAL/obj/Debug/YX.DAL.pdb
index 22535a5..54783c4 100644
--- a/YX.DAL/obj/Debug/YX.DAL.pdb
+++ b/YX.DAL/obj/Debug/YX.DAL.pdb
Binary files differ
diff --git a/YX.Entity/bin/Debug/YX.Entity.dll b/YX.Entity/bin/Debug/YX.Entity.dll
index 5557277..bc16856 100644
--- a/YX.Entity/bin/Debug/YX.Entity.dll
+++ b/YX.Entity/bin/Debug/YX.Entity.dll
Binary files differ
diff --git a/YX.Entity/bin/Debug/YX.Entity.pdb b/YX.Entity/bin/Debug/YX.Entity.pdb
index 064e76c..e2117a5 100644
--- a/YX.Entity/bin/Debug/YX.Entity.pdb
+++ b/YX.Entity/bin/Debug/YX.Entity.pdb
Binary files differ
diff --git a/YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache b/YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache
index 2cc46af..f51d22b 100644
--- a/YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache
+++ b/YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache
Binary files differ
diff --git a/YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache b/YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache
index 5f96d98..9968adc 100644
--- a/YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache
+++ b/YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-d8f53ce9adfc52e9bc42643913659aa4dc61f57a
+b5e283db430385ce16b511293d0e30d773cb9f6d
diff --git a/YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt b/YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt
index 3c59b7d..7e8e4a3 100644
--- a/YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt
+++ b/YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt
@@ -30,3 +30,15 @@
D:\YX\YX.Entity\obj\Debug\YX.Entity.csproj.CopyComplete
D:\YX\YX.Entity\obj\Debug\YX.Entity.dll
D:\YX\YX.Entity\obj\Debug\YX.Entity.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\YX.Entity.dll.config
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\YX.Entity.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\YX.Entity.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\EntityFramework.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\EntityFramework.SqlServer.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\YX.Common.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\bin\Debug\YX.Common.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\obj\Debug\YX.Entity.csproj.AssemblyReference.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\obj\Debug\YX.Entity.csproj.CoreCompileInputs.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\obj\Debug\YX.Entity.csproj.CopyComplete
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\obj\Debug\YX.Entity.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX.Entity\obj\Debug\YX.Entity.pdb
diff --git a/YX.Entity/obj/Debug/YX.Entity.dll b/YX.Entity/obj/Debug/YX.Entity.dll
index 5557277..bc16856 100644
--- a/YX.Entity/obj/Debug/YX.Entity.dll
+++ b/YX.Entity/obj/Debug/YX.Entity.dll
Binary files differ
diff --git a/YX.Entity/obj/Debug/YX.Entity.pdb b/YX.Entity/obj/Debug/YX.Entity.pdb
index 064e76c..e2117a5 100644
--- a/YX.Entity/obj/Debug/YX.Entity.pdb
+++ b/YX.Entity/obj/Debug/YX.Entity.pdb
Binary files differ
diff --git a/YX/bin/Debug/YX.BLL.dll b/YX/bin/Debug/YX.BLL.dll
index 3de7625..ffc9e24 100644
--- a/YX/bin/Debug/YX.BLL.dll
+++ b/YX/bin/Debug/YX.BLL.dll
Binary files differ
diff --git a/YX/bin/Debug/YX.BLL.pdb b/YX/bin/Debug/YX.BLL.pdb
index bf736ef..556912d 100644
--- a/YX/bin/Debug/YX.BLL.pdb
+++ b/YX/bin/Debug/YX.BLL.pdb
Binary files differ
diff --git a/YX/bin/Debug/YX.DAL.dll b/YX/bin/Debug/YX.DAL.dll
index 629450b..1269fd7 100644
--- a/YX/bin/Debug/YX.DAL.dll
+++ b/YX/bin/Debug/YX.DAL.dll
Binary files differ
diff --git a/YX/bin/Debug/YX.DAL.pdb b/YX/bin/Debug/YX.DAL.pdb
index 22535a5..54783c4 100644
--- a/YX/bin/Debug/YX.DAL.pdb
+++ b/YX/bin/Debug/YX.DAL.pdb
Binary files differ
diff --git a/YX/bin/Debug/YX.Entity.dll b/YX/bin/Debug/YX.Entity.dll
index 5557277..bc16856 100644
--- a/YX/bin/Debug/YX.Entity.dll
+++ b/YX/bin/Debug/YX.Entity.dll
Binary files differ
diff --git a/YX/bin/Debug/YX.Entity.pdb b/YX/bin/Debug/YX.Entity.pdb
index 064e76c..e2117a5 100644
--- a/YX/bin/Debug/YX.Entity.pdb
+++ b/YX/bin/Debug/YX.Entity.pdb
Binary files differ
diff --git a/YX/bin/Debug/YX.exe b/YX/bin/Debug/YX.exe
index 013dc61..e1726d6 100644
--- a/YX/bin/Debug/YX.exe
+++ b/YX/bin/Debug/YX.exe
Binary files differ
diff --git a/YX/bin/Debug/YX.pdb b/YX/bin/Debug/YX.pdb
index 354f835..70d88a2 100644
--- a/YX/bin/Debug/YX.pdb
+++ b/YX/bin/Debug/YX.pdb
Binary files differ
diff --git a/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 0c16825..66ec07a 100644
--- a/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/YX/obj/Debug/YX.FrmMain.resources b/YX/obj/Debug/YX.FrmMain.resources
index 19fadf6..036bb86 100644
--- a/YX/obj/Debug/YX.FrmMain.resources
+++ b/YX/obj/Debug/YX.FrmMain.resources
Binary files differ
diff --git a/YX/obj/Debug/YX.csproj.AssemblyReference.cache b/YX/obj/Debug/YX.csproj.AssemblyReference.cache
index 38baece..f5e894a 100644
--- a/YX/obj/Debug/YX.csproj.AssemblyReference.cache
+++ b/YX/obj/Debug/YX.csproj.AssemblyReference.cache
Binary files differ
diff --git a/YX/obj/Debug/YX.csproj.CoreCompileInputs.cache b/YX/obj/Debug/YX.csproj.CoreCompileInputs.cache
index a5f3c15..e2c11d9 100644
--- a/YX/obj/Debug/YX.csproj.CoreCompileInputs.cache
+++ b/YX/obj/Debug/YX.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9388a4f6181b0756c8938115c12cc270ee0df3b4
+95ea5546ba3dfb78b7ef9a805b28ae5434625aab
diff --git a/YX/obj/Debug/YX.csproj.FileListAbsolute.txt b/YX/obj/Debug/YX.csproj.FileListAbsolute.txt
index 696d42b..7234b5e 100644
--- a/YX/obj/Debug/YX.csproj.FileListAbsolute.txt
+++ b/YX/obj/Debug/YX.csproj.FileListAbsolute.txt
@@ -123,3 +123,49 @@
D:\YX\YX\bin\Debug\EasyModbus.xml
D:\YX\YX\obj\Debug\YX.Frmhome.resources
D:\YX\YX\obj\Debug\YX.wt.Frmwt.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.exe.config
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.exe
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\EasyModbus.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\EntityFramework.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\EntityFramework.SqlServer.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\log4net.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\Newtonsoft.Json.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.BLL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.Common.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.Entity.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.DAL.dll
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.BLL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.Common.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.Entity.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.Entity.dll.config
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\EasyModbus.xml
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\bin\Debug\YX.DAL.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.AssemblyReference.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.Frmhome.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmGoodsInfo.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmAppendProperty.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmAppendPropertyEdit.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmDataCenter.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmDeptInfo.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmDeptInfoEdit.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmExpress.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmLeft.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmListImages.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmLogin.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmMain.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmMenu.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmMenuEdit.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmRole.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmRoleEdit.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmUserInfo.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmUserInfoEdit.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.Properties.Resources.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.WindowParent.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.wt.Frmwt.resources
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.GenerateResource.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.CoreCompileInputs.cache
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.CopyComplete
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.exe
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.pdb
diff --git a/YX/obj/Debug/YX.csproj.GenerateResource.cache b/YX/obj/Debug/YX.csproj.GenerateResource.cache
index 5a2b005..fe153d5 100644
--- a/YX/obj/Debug/YX.csproj.GenerateResource.cache
+++ b/YX/obj/Debug/YX.csproj.GenerateResource.cache
Binary files differ
diff --git a/YX/obj/Debug/YX.exe b/YX/obj/Debug/YX.exe
index 013dc61..e1726d6 100644
--- a/YX/obj/Debug/YX.exe
+++ b/YX/obj/Debug/YX.exe
Binary files differ
diff --git a/YX/obj/Debug/YX.pdb b/YX/obj/Debug/YX.pdb
index 354f835..70d88a2 100644
--- a/YX/obj/Debug/YX.pdb
+++ b/YX/obj/Debug/YX.pdb
Binary files differ
diff --git a/YX/wt/Frmwt.cs b/YX/wt/Frmwt.cs
index df916b6..8513e9d 100644
--- a/YX/wt/Frmwt.cs
+++ b/YX/wt/Frmwt.cs
@@ -34,6 +34,7 @@
public string PSN = "";
public string PSN2 = "";
public string PSN3 = "";
+ public bool t = true;
public Frmwt(string ParentId)
{
InitializeComponent();
@@ -224,9 +225,8 @@
private void LabelShow()
{
- //string[] aaa = PSN.Split(',');
- //string bbbb = aaa[0];
- PSNBox.Text = PSN;
+ string[] b_str = PSN.Split(',');
+ PSNBox.Text = b_str[1];
JObject jo = WI6027();
if (jo == null)
@@ -254,7 +254,7 @@
JObject jo1032 = WI1032(PSNBox.Text, SNMBox.Text, KPNMBox.Text, KPValueBox.Text);
if (jo1032 != null)
{
- if (WI6041(PSNBox.Text, SNMBox.Text, KPNMBox.Text, jo1032))
+ if (WI6041(PSNBox.Text, SNMBox.Text, KPNMBox.Text, b_str[0]))
{
System_Bll.WriteLogToDB(new Entity.Base_Log
{
@@ -309,9 +309,7 @@
public JObject WI6027()
{
- //string WI6027 = "{ \"user\":\"sys\",\"password\":\"sysuser\",\"method\":\"MES_BA_WI6027\",\"servername\":\"TEST_WTMES_Customer\",\"methodparameter\":{ \"mac\":\"6A:15:63:C3:CC:EA\",\"hostName\":\"liuxingliang-PC\"} }";
- string a = "D0:8E:79:02:CF:91";
-
+ string a = "a0:36:9F:6c:0e:95";
string WI6027 = "{";
WI6027 += "\"user\":\"sys\",";
WI6027 += "\"password\":\"sysuser\",";
@@ -319,17 +317,16 @@
WI6027 += "\"servername\":\"London\",";
WI6027 += "\"methodparameter\":{";
WI6027 += "\"mac\":\"" + a + "\",";
- WI6027 += "\"hostName\":\"PC-20230103TQKE\"";
+ WI6027 += "\"hostName\":\"DESKTOP-UV8I1I0\"";
WI6027 += "}}";
- JObject jo = MES_Interface(WI6027, encryptionKey);
- return jo;
+ return MES_Interface(WI6027, encryptionKey);
}
public bool WI601K(string BarCode)
{
//string WI601K = "{\"user\":\"sys\",聽\"password\":\"sysuser\",\"method\":\"MES_BA_WI601K\",\"servername\":\"TEST_WTMES_Customer\",聽\"methodparameter\":{\"BarCode\":\"123456789\",聽\"HostName\":\"liuxingliang-PC\",聽\"Mac\":\"6A:15:63:C3:CC:EA\"聽}}\n";
-
+ string a = "a0:36:9F:6c:0e:95";
string WI601K = "{";
WI601K += "\"user\":\"sys\",";
WI601K += "\"password\":\"sysuser\",";
@@ -337,21 +334,23 @@
WI601K += "\"servername\":\"London\",";
WI601K += "\"methodparameter\":{";
WI601K += "\"BarCode\":\"" + BarCode + "\",";
- WI601K += "\"HostName\":\"liuxingliang-PC\",";
- WI601K += "\"Mac\":\"6A:15:63:C3:CC:EA\"";
+ WI601K += "\"HostName\":\"DESKTOP-UV8I1I0\",";
+ WI601K += "\"Mac\":\"" + a + "\"";
WI601K += "}";
WI601K += "}";
JObject jo = MES_Interface(WI601K, encryptionKey);
if (jo["state"].ToString() == "false")
{
+ t = false;
System_Bll.WriteLogToDB(new Entity.Base_Log
+
{
CreateUserID = FrmLogin.LoginUserID,
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
- LogMessage = "MES鎺ュ彛WI601K,鏉＄爜姣斿澶辫触锛�",
- Type = "鍖呰绾�",
+ LogMessage = "WI601K鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(),
+ Type = "绉伴噸",
ClassName = typeof(FrmLogin).ToString()
});
return false;
@@ -375,13 +374,14 @@
JObject jo = MES_Interface(WI1032, encryptionKey);
if (jo["state"].ToString() == "false")
{
+ t = false;
System_Bll.WriteLogToDB(new Entity.Base_Log
{
CreateUserID = FrmLogin.LoginUserID,
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
- LogMessage = "MES鎺ュ彛WI1032鏉＄爜閭﹀畾澶辫触",
- Type = "鍖呰绾�",
+ LogMessage = "WI1032鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(),
+ Type = "绉伴噸",
ClassName = typeof(FrmLogin).ToString()
});
return null;
@@ -389,61 +389,58 @@
return jo;
}
- public bool WI6041(string Line, string Station, string StationID, JObject outWI1032)
+ public bool WI6041(string Line, string Station, string StationID, string PSN)
{
- var contents = outWI1032["content"];
-
- string WI6041 = "{ " +
- "\n\"user\":\"sys\", " +
- "\n\"password\":\"sysuser\", " +
- "\n\"method\":\"MES_BA_WI6041\", " +
- "\n\"servername\":\"London\", " +
- "\n\"methodparameter\":{ " +
- "\n\"content\":{ " +
- "\n\"snresult\":{ " +
- "\n}, " +
- "\n\"testresult\":{ " +
- "\n\"psn\":\"" + (string)contents["PSN"] + "\", " +
- "\n\"workordernumber\":\"100000236815\", " +
- "\n\"testStationId\":\"" + StationID + "\", " +
- "\n\"testStationName\":\"" + Station + "\", " +
- "\n\"linename\":\"" + Line + "\", " +
- "\n\"hostname\":\"admin-PC-0930\", " +
- "\n\"testTime\":\"" + string.Format("{0:yyyy-MM-dd HH:mm:ss.fff}", DateTime.Now) + "\", " +
- "\n\"testModel\":\"S87567GB002_BLK1\", " +
- "\n\"testWorkID\":\"\", " +
- "\n\"Fixture\":\"\", " +
- "\n\"FixtureSN\":\"\", " +
- "\n\"Powersupply\":\"\", " +
- "\n\"PowersupplySN\":\"\", " +
- "\n\"Instrument\":\"\", " +
- "\n\"InstrumentSN\":\"\", " +
- "\n\"Operator\":\"\", " +
- "\n\"testVersion\":\"V1.0.1\" " +
- "\n}, " +
- "\n\"itemresult\":[ " +
- "\n]," +
- "\n\"specialitem\":[ " +
- "\n] " +
- "\n}, " +
- "\n\"state\":\"pass\", " +
- "\n\"errcode\":\"\", " +
- "\n\"errmessage\":\"\"} " +
- "\n}";
+ string WI6041 = "{ ";
+ WI6041 += "\n\"user\":\"sys\", ";
+ WI6041 += "\n\"password\":\"sysuser\", ";
+ WI6041 += "\n\"method\":\"MES_BA_WI6041\", ";
+ WI6041 += "\n\"servername\":\"London\", ";
+ WI6041 += "\n\"methodparameter\":{ ";
+ WI6041 += "\n\"content\":{ ";
+ WI6041 += "\n\"snresult\":{ ";
+ WI6041 += "\n}, ";
+ WI6041 += "\n\"testresult\":{ ";
+ WI6041 += "\n\"psn\":\"" + PSN + "\", ";
+ WI6041 += "\n\"workordernumber\":\"100000236815\", ";
+ WI6041 += "\n\"testStationId\":\"" + StationID + "\", ";
+ WI6041 += "\n\"testStationName\":\"" + Station + "\", ";
+ WI6041 += "\n\"linename\":\"" + Line + "\", ";
+ WI6041 += "\n\"hostname\":\"admin-PC-0930\", ";
+ WI6041 += "\n\"testTime\":\"" + string.Format("{0:yyyy-MM-dd HH:mm:ss.fff}", DateTime.Now) + "\", ";
+ WI6041 += "\n\"testModel\":\"S87567GB002_BLK1\", ";
+ WI6041 += "\n\"testWorkID\":\"\", ";
+ WI6041 += "\n\"Fixture\":\"\", ";
+ WI6041 += "\n\"FixtureSN\":\"\", ";
+ WI6041 += "\n\"Powersupply\":\"\", ";
+ WI6041 += "\n\"PowersupplySN\":\"\", ";
+ WI6041 += "\n\"Instrument\":\"\", ";
+ WI6041 += "\n\"InstrumentSN\":\"\", ";
+ WI6041 += "\n\"Operator\":\"\", ";
+ WI6041 += "\n\"testVersion\":\"V1.0.1\" ";
+ WI6041 += "\n}, ";
+ WI6041 += "\n\"itemresult\":[ ";
+ WI6041 += "\n],";
+ WI6041 += "\n\"specialitem\":[ ";
+ WI6041 += "\n] ";
+ WI6041 += "\n}, ";
+ WI6041 += "\n\"state\":\"pass\", ";
+ WI6041 += "\n\"errcode\":\"\", ";
+ WI6041 += "\n\"errmessage\":\"\"} ";
+ WI6041 += "\n}";
JObject jo = MES_Interface(WI6041, encryptionKey);
if (jo["state"].ToString() == "false")
{
+ t = false;
System_Bll.WriteLogToDB(new Entity.Base_Log
{
CreateUserID = FrmLogin.LoginUserID,
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
- LogMessage = "MES鎺ュ彛WI6041鏁版嵁鎻愪氦澶辫触",
- Type = "鍖呰绾�",
+ LogMessage = "WI6041鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(),
+ Type = "绉伴噸",
ClassName = typeof(FrmLogin).ToString()
});
-
- string a = string.Format("{0:yyyy-MM-dd HH:mm:ss.fff}", DateTime.Now);
return false;
}
return true;
--
Gitblit v1.9.3