From 9ea2ab0b5cbe97c3cd9cf4d730b85a8d4d7ebfb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Thu, 20 Mar 2025 11:11:53 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E6=B7=BB=E5=8A=A0=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5=E6=8A=A5=E8=A1=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=87=A0=E4=B8=AA?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   4 +-
 .../.vs/AutoUpdate.csproj.dtbcache.json       |   2 +-
 .../.vs/CentralControl.csproj.dtbcache.json   |   2 +-
 ...amework,Version=v4.8.AssemblyAttributes.cs |   4 +
 ...tralControl.csproj.AssemblyReference.cache | Bin 0 -> 15214 bytes
 .../.vs/CommonFunc.csproj.dtbcache.json       |   2 +-
 .../LanJu/.vs/LanJu.csproj.dtbcache.json      |   2 +-
 .../.vs/LanJuControl.csproj.dtbcache.json     |   2 +-
 .../.vs/LanJuLib.csproj.dtbcache.json         |   2 +-
 .../.vs/RestartApp.csproj.dtbcache.json       |   2 +-
 shangjian/RestartApp/bin/Debug/RestartApp.exe | Bin 8704 -> 8704 bytes
 shangjian/RestartApp/bin/Debug/RestartApp.pdb | Bin 28160 -> 28160 bytes
 .../RestartApp.csproj.CoreCompileInputs.cache |   2 +-
 .../RestartApp.csproj.FileListAbsolute.txt    |  11 +
 shangjian/RestartApp/obj/Debug/RestartApp.exe | Bin 8704 -> 8704 bytes
 shangjian/RestartApp/obj/Debug/RestartApp.pdb | Bin 28160 -> 28160 bytes
 .../.vs/WPFupdate.csproj.dtbcache.json        |   2 +-
 .../.vs/XGL.Data.csproj.dtbcache.json         |   2 +-
 .../DBService/FormingMachineService.cs        |  60 ++
 .../.vs/XGL.Models.csproj.dtbcache.json       |   2 +-
 ...amework,Version=v4.8.AssemblyAttributes.cs |   4 +
 .../XGL.Models.csproj.AssemblyReference.cache | Bin 0 -> 9241 bytes
 .../.vs/XGL.Thrift.csproj.dtbcache.json       |   2 +-
 shangjian/XGL/.vs/XGL.csproj.dtbcache.json    |   2 +-
 .../.vs/XGLFinishPro.csproj.dtbcache.json     |   2 +-
 .../Views/Lanju_Daily_Check_Report.xaml       | 230 +++++
 .../Views/Lanju_Daily_Check_Report.xaml.cs    | 960 ++++++++++++++++++
 .../XGLFinishPro/Views/ReportPageSelect.xaml  |   1 +
 .../Views/ReportPageSelect.xaml.cs            |   9 +
 shangjian/XGLFinishPro/XGLFinishPro.csproj    |   7 +
 30 files changed, 1302 insertions(+), 16 deletions(-)
 create mode 100644 shangjian/CentralControl/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
 create mode 100644 shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
 create mode 100644 shangjian/XGL.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
 create mode 100644 shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache
 create mode 100644 shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml
 create mode 100644 shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml.cs

diff --git a/.gitignore b/.gitignore
index 71a7a19..fee07b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,5 @@ shangjian/XGL.Model/obj/x86/Debug/
 shangjian/XGL.Model/bin/x86/Debug/
 shangjian/XGL.Thrift/bin/Debug/
 shangjian/XGL.Thrift/obj/Debug/
-shangjian/.vs/*
-/shangjian/.vscode/settings.json
+shangjian/.vscode/*
+shangjian/AutoUpdate/.vs/AutoUpdate*
diff --git a/shangjian/AutoUpdate/.vs/AutoUpdate.csproj.dtbcache.json b/shangjian/AutoUpdate/.vs/AutoUpdate.csproj.dtbcache.json
index 22e1731..cfa4f6e 100644
--- a/shangjian/AutoUpdate/.vs/AutoUpdate.csproj.dtbcache.json
+++ b/shangjian/AutoUpdate/.vs/AutoUpdate.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\AutoUpdate","ProjectFileName":"AutoUpdate.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"Form1.cs"},{"SourceFile":"Form1.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Web References\\autoUpdateVersion\\Reference.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\AutoUpdate\\SevenZipSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\AutoUpdate\\bin\\Debug\\AutoUpdate.exe","OutputItemRelativePath":"AutoUpdate.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\AutoUpdate\\bin\\Debug\\AutoUpdate.pdb","OutputItemRelativePath":"AutoUpdate.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\AutoUpdate","ProjectFileName":"AutoUpdate.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"Form1.cs"},{"SourceFile":"Form1.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Web References\\autoUpdateVersion\\Reference.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\AutoUpdate\\SevenZipSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\AutoUpdate\\bin\\Debug\\AutoUpdate.exe","OutputItemRelativePath":"AutoUpdate.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/CentralControl/.vs/CentralControl.csproj.dtbcache.json b/shangjian/CentralControl/.vs/CentralControl.csproj.dtbcache.json
index 5c2a987..9a176ae 100644
--- a/shangjian/CentralControl/.vs/CentralControl.csproj.dtbcache.json
+++ b/shangjian/CentralControl/.vs/CentralControl.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CentralControl","ProjectFileName":"CentralControl.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"App_Code\\Logic1003InputLocator.cs"},{"SourceFile":"App_Code\\Logic1005EmptyLocator.cs"},{"SourceFile":"App_Code\\Logic1006EmptyLocator.cs"},{"SourceFile":"App_Code\\Logic2008MiddleLocator.cs"},{"SourceFile":"App_Code\\Logic2003BackLocator.cs"},{"SourceFile":"App_Code\\Logic3001OffLine.cs"},{"SourceFile":"App_Code\\Logic4001_4002OutLocator.cs"},{"SourceFile":"App_Code\\Logic2004_2009_2010_2011UpLocator.cs"},{"SourceFile":"App_Code\\Logic2006_2005UpLocator.cs"},{"SourceFile":"App_Code\\Logic101_104UpLine.cs"},{"SourceFile":"App_Code\\PlcHelper.cs"},{"SourceFile":"App_Code\\snap7.net.cs"},{"SourceFile":"App_Code\\MainCentralControl.cs"},{"SourceFile":"App_Code\\StaticData.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\bin\\x86\\Debug\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe","OutputItemRelativePath":"CentralControl.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.pdb","OutputItemRelativePath":"CentralControl.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CentralControl","ProjectFileName":"CentralControl.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"App_Code\\Logic1003InputLocator.cs"},{"SourceFile":"App_Code\\Logic1005EmptyLocator.cs"},{"SourceFile":"App_Code\\Logic1006EmptyLocator.cs"},{"SourceFile":"App_Code\\Logic2008MiddleLocator.cs"},{"SourceFile":"App_Code\\Logic2003BackLocator.cs"},{"SourceFile":"App_Code\\Logic3001OffLine.cs"},{"SourceFile":"App_Code\\Logic4001_4002OutLocator.cs"},{"SourceFile":"App_Code\\Logic2004_2009_2010_2011UpLocator.cs"},{"SourceFile":"App_Code\\Logic2006_2005UpLocator.cs"},{"SourceFile":"App_Code\\Logic101_104UpLine.cs"},{"SourceFile":"App_Code\\PlcHelper.cs"},{"SourceFile":"App_Code\\snap7.net.cs"},{"SourceFile":"App_Code\\MainCentralControl.cs"},{"SourceFile":"App_Code\\StaticData.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\Microsoft.Net\\assembly\\GAC_MSIL\\NLog\\v4.0_2.1.0.0__5120e14c03d0593c\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe","OutputItemRelativePath":"CentralControl.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/CentralControl/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/shangjian/CentralControl/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
new file mode 100644
index 0000000..15efebf
--- /dev/null
+++ b/shangjian/CentralControl/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
new file mode 100644
index 0000000000000000000000000000000000000000..8e1beca2e580432fe2de8d10b85e5ed83cbea6c8
GIT binary patch
literal 15214
zcmds8dvFuS8P~?fCN^(EFcgAKfI@2S<cItUCKws>sO12nV5q3)bUMjrOLz9^gs}^O
zsY#pAp|lX<68M8m6VgIL8d^w(2?koyG|i+GCJ>&(qm()+G-aCbPTJkoolcJnwt9OR
zPmkd&-JSNn_xJn0-Ax0-Efx!Kd&*obqSVL>zB)$Y7*~@dHgK%$y0U#u*ZQ@W-&%Wl
z|GFz%_qqIx&=8u;`gu-}UBP-r@HOy^;HsTjO)aRGc(3eo^Mb3AbBBCU7b%b54*-18
z$&T_HcRc6%0su0!-{4#DZp`rj{03IRQ|fB?0saLIUf$1@(KPKTqoawX6=LZ)V(DmN
z=?Jm3_F@_mOJicAE+S&_3oW2Rdo(wDAtwcSQ7F%&tmt2EwmsyRLlRdma3NV@{JGh4
zLvBCMew%AuAU1MBxe$T_A;K{$0Q3z6SyA%yZjg#D>l~P0bRF>v&wb(P%{JG<5rr3?
z4POBuEi7mJ#Dnl+3cjJ8;>U>G!M^|*%L*a&1=fPRQULl>H8U1eNlbu4^2B7JSN=yi
zfCbdq%Up9M(FdQ&u7ctZW=~vRQZ&gmpYw7OC$L<0MKH((Am3cj<=|OK42sYQB4fH@
z-r#~SFL9}2h**VX-O|nHcc191NWBjvp`Rd10p24pl;Cg5L|+6i8}-?PKI4Z3ZzH~;
ze!+L5*|dP~8?^2whHYegkinUv=<{<F6o@RkLtd(YvQc?1s8N@|$%VFr`>NS@eLmTi
z&S0}27&it$`a>LtRUZC}KF8XAJ0N8IDlc>#9bsN*$P0~mNw|-A*#_ydj0?NubMRvt
zvTXQ$zOy3F0*x9PjAi`lfp6bqUtHn+P0Eh0%#`h&JBByz?Y!0AX%`<G)_Uz^ze`ik
z4;wkA`dY{9?K?mC`H=L~F~@hGetdR&)xCSCW)C_}k9V$^WB>CLox{(rv|oAujAQ+f
z>1X%u-?BKZQ$D?J$4Y7S?Plx0vtIP4@4KGWzGawu^Gi>Uy?y6W@u=sycXn;vi=F0`
zV;r~d@QG9~KaNe!jj`@};>Jv|C%?#6WOFlYp{K}Nh-84Z27?$Omv*)WWiDVSEM$hq
zpzNZ=85jsN*IkT2<{A|vnn}5rqt)5$rz#nlp^B&y7%5cGvbv&fsZMpea)atr8QN`-
z28lyK4E;w3_9gT;CYQ95b|;O3FzpdfveHqvdg?@{g8P3pra6?md{V`PjyV<EerSLA
z2hBI?4&I&eVI8+_+nBdsS@P~Q-_f76-MwD5vTfeh3*&w~w7FyW#Bcoe+=o{`8d=-_
z%Lj*?|2>~MdfdAgJHC7KpQi@Qd81~~+()k6WDneWHT%g;uC2p<cckV3$DYj36n=U1
zlah3IUd3l`jr?nd|Cz?A7qJt)Q@`qu&+>;Iz@c%V`484mPyC0q6_pfw*^-jdqEfc7
z(1VqNGFPwip8<;hR7y+>L_tZp(667UTQ&H2Mj7G^ai#hqvgD)&iqG{!6`~eMj1Xj4
z8N!dCp#eulqJ-e(eIbcKLsGMapv=JV4kNhk5f3SlYsK@Np^RJ`NN${XmLJli&=6&V
zl@T3`0F!tC0#^gWA^Aju3tbF_9*T;Oiy($t#0ws=B?=-@HJt2X!q}<RHM7EA=Wx!h
zcGXmiK7^92b@>zqnss%yynHK{SIAlmJXTw20gIoBV5e7ud+L|X!_XoX{WuIZ5e3Sj
zAOGsq_-8Mp724<sd_%O+Ds8k%8;ypi?@t?k2Gh0;y&gh?)YTTtS3!lAM}Kx@%AlDO
zUpta@sWerdFn;l!RfR9*)Xw@W|CtZELTBH5ENv{c<-+1`<&3#G=ggjCBinX<XY8J7
zZv^Y;ly7dx=_6k2e9Ad3c)IiBGqY}8{l}5f@2%amNSN{dr=NehV%GGhpPRRH@~*b_
zrt7<JzC7vJpK=CFUE}DmJ^E4ki1HhURt<e<JC1VmvM*Mr{AKYJFca~o#WzL%-NXEN
z{Xo8<iJ((&!Ut+7adOf!p5+{(hco7=q#a(dLaGX4ePcncSB7%(aZSxK1`!_sYEqaV
z5@bHWQP4zq#?QCm<d9UXj1A^tN9d;BL=Qz`Wttr~7Qj*ys!k;fsOV9vIZ**d%vH&&
znT(&s>%szL6J%V)u#5-R$&nl$Xc7gOaB;MWq%2kRQ0T*SpN!aCbWMyoh{5nHqH>r{
zkAl|gQD{kyj`S$#m>vbna3!?D39U<Cj}u(_(L0L{?>hCbUr=jy4BYia|Bt)AXt=um
zM|V?}`P-{EZ+K+)<9~nQ)bX>2&b@G~XlTv@Kh2b;++MwD)!~aRgVz5cz2(VCUHJnx
zeA4IY<*uBAFMrx~-Q%k6xAD-<%@dcpb9ZpLqwkz3mzRo@|91VU@4Y_o@bl#pMy(xU
z=d!W`2R9ZvmK@uN6P$|FK&>t_TE;_-A&5D;&v<TYf!F3O_U7ezY*wa#!KxwK<O-7-
zF$DC6=tB>Y-aq(QzzP!#URR>Hf~^n)QN|H8m|*x8%onkklV(_00FaMcgwhkzdNkm+
zfJQU*7+n@6rV8Ar>rJSROmYBVpkl~Qjtxn?+?tf*sR0H%D70$RG#~uBG_MrII*$8)
zYXN3~KrOV80{Dp$!EK&h;AUiEAn0}ND^h_#Efa}#oYcrt6AHkxf;Cpzk<U^OD}hg~
zee4WdPpbWAxG)=`5H~}RIjKqFgPc;mCnv?&_?+lIW>f+S<=B1D$;rtxmdl)gW>8HB
zL}~&u+<zs3tW;tQT0^4RI1{5@xCyS4|A-dLB*aTPBqYk&Z@!!>xghTobi_>*ZjkJY
zkyITiV4y(_yBLMz4Pe<sW2iUJ7_|8b9Ya7<Grg){RPkbrsEN!Z4c6u%<~Ui2Z<290
z9qA(e&}##9m+ed}B2*9&(?HcxCYquqrc6@EkAz2$j+BwwBm=Ywh+YK7pB!k(J5aLl
zwW1muRyh<_f2X68XMBPflzSVBL?p(xC>qR*64CQFI;NFH(zI0QQp*^e)FokCDlrCe
z6aXd~sTve@13^-GD7KkNKC{8~mx`|%ov=5-F=u<=oB`}Y8K0!gQtJ?2f~#3Ysg*zh
z1px6Pd9;@Dq6=?oy2N{Y$t~xKO@A7#i#Ru$*h6!_$pzy00Zl1N0eD2wRE+K+#eS@}
z<VcQp9(8OagNmjmxJDN@=Km*g#OI|!3f&Ga7-W1#TL)^l1Ue;E%?r(jVn((?ni`EN
z;d&pppTo^fflZdwc*fPKJ4K3c0uEYMa(aq4EtPw?{Dhh%%S}mfA3vC?bcMd~6l4Wl
zL$xgVdF^=KRYD20%fD9e5EEPyyP8C+P11!q047Bq65xbPGEKAvuX#XH4KX?(lBgY!
z5e?k;5RPU^#f11oU>-grgiaGJz-NL5XlTRktY@Sq9TVtv{RTn;1|ZS}YZaIP&n9J0
zu{kDDS&RwFQj$1w*Tjh3>(n$vAs09P;c9-P)dlG+lBl!!q;@Za_hm(tH15r7>h^^D
zZP~)hb7Ph@Em4;>RT|so7TM{e5f<KL1j@r#w3R<rsub@3>A}jM$d)$6@M64D-N}Sx
z9DV3@>7pYuUgZT_JZgkTD~a@uo{pn!$}u{Un!8}(fY(*`l&a`B5#|p4684Dl;SwvG
zwK%^RZn-osR-hJ1#17Tfb{0T1t*gpHhM;$Jr!3R}RmE#GNT_g}$Q-jem>Jmqzdw-g
AUH||9

literal 0
HcmV?d00001

diff --git a/shangjian/CommonFunc/.vs/CommonFunc.csproj.dtbcache.json b/shangjian/CommonFunc/.vs/CommonFunc.csproj.dtbcache.json
index cb23afc..50d7808 100644
--- a/shangjian/CommonFunc/.vs/CommonFunc.csproj.dtbcache.json
+++ b/shangjian/CommonFunc/.vs/CommonFunc.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc","ProjectFileName":"CommonFunc.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"Common.cs"},{"SourceFile":"DataConfig\\ConnectionConfig.cs"},{"SourceFile":"DataConfig\\DatabaseConfig.cs"},{"SourceFile":"DataConfig\\DataCache.cs"},{"SourceFile":"DataConfig\\SqlDataObject.cs"},{"SourceFile":"DbHelperSQLServer.cs"},{"SourceFile":"DbHelperToMES.cs"},{"SourceFile":"ExcelHelper.cs"},{"SourceFile":"HMessageBox.xaml.cs"},{"SourceFile":"JsonHelper.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"LogHelper.cs"},{"SourceFile":"LoginUserInfo.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SecurityHelper\\DESProvider.cs"},{"SourceFile":"SecurityHelper\\MD5Provider.cs"},{"SourceFile":"snap7.net.cs"},{"SourceFile":"SqlServerDbHelper.cs"},{"SourceFile":"Tools\\CustomMessageBox.cs"},{"SourceFile":"Tools\\MachineRepairWin.xaml.cs"},{"SourceFile":"Tools\\PauseOrderWin.xaml.cs"},{"SourceFile":"Tools\\PauseRecoverWin.xaml.cs"},{"SourceFile":"Tools\\PlcHelper.cs"},{"SourceFile":"Tools\\RestHelper.cs"},{"SourceFile":"Tools\\Utils.cs"},{"SourceFile":"UserInfo.cs"},{"SourceFile":"WorkPost.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\HMessageBox.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\Tools\\MachineRepairWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\Tools\\PauseOrderWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\Tools\\PauseRecoverWin.g.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\BCrypt.Net-Next.4.0.3\\lib\\net48\\BCrypt.Net-Next.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\QRCoder.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Data.SqlClient.4.8.5\\lib\\net461\\System.Data.SqlClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Memory.4.5.4\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","OutputItemRelativePath":"CommonFunc.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.pdb","OutputItemRelativePath":"CommonFunc.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc","ProjectFileName":"CommonFunc.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"Common.cs"},{"SourceFile":"DataConfig\\ConnectionConfig.cs"},{"SourceFile":"DataConfig\\DatabaseConfig.cs"},{"SourceFile":"DataConfig\\DataCache.cs"},{"SourceFile":"DataConfig\\SqlDataObject.cs"},{"SourceFile":"DbHelperSQLServer.cs"},{"SourceFile":"DbHelperToMES.cs"},{"SourceFile":"ExcelHelper.cs"},{"SourceFile":"HMessageBox.xaml.cs"},{"SourceFile":"JsonHelper.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"LogHelper.cs"},{"SourceFile":"LoginUserInfo.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SecurityHelper\\DESProvider.cs"},{"SourceFile":"SecurityHelper\\MD5Provider.cs"},{"SourceFile":"snap7.net.cs"},{"SourceFile":"SqlServerDbHelper.cs"},{"SourceFile":"Tools\\CustomMessageBox.cs"},{"SourceFile":"Tools\\MachineRepairWin.xaml.cs"},{"SourceFile":"Tools\\PauseOrderWin.xaml.cs"},{"SourceFile":"Tools\\PauseRecoverWin.xaml.cs"},{"SourceFile":"Tools\\PlcHelper.cs"},{"SourceFile":"Tools\\RestHelper.cs"},{"SourceFile":"Tools\\Utils.cs"},{"SourceFile":"UserInfo.cs"},{"SourceFile":"WorkPost.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\HMessageBox.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\Tools\\MachineRepairWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\Tools\\PauseOrderWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\obj\\x86\\Debug\\Tools\\PauseRecoverWin.g.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\BCrypt.Net-Next.4.0.3\\lib\\net48\\BCrypt.Net-Next.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\QRCoder.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Data.SqlClient.4.8.5\\lib\\net461\\System.Data.SqlClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Memory.4.5.4\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","OutputItemRelativePath":"CommonFunc.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/LanJu/.vs/LanJu.csproj.dtbcache.json b/shangjian/LanJu/.vs/LanJu.csproj.dtbcache.json
index aeaeacd..ac1f282 100644
--- a/shangjian/LanJu/.vs/LanJu.csproj.dtbcache.json
+++ b/shangjian/LanJu/.vs/LanJu.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu","ProjectFileName":"LanJu.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Views\\LanJu_Complete.xaml.cs"},{"SourceFile":"Views\\LanJu_DeviceItems.xaml.cs"},{"SourceFile":"Views\\LanJu_Flow.xaml.cs"},{"SourceFile":"Views\\LanJu_Index.xaml.cs"},{"SourceFile":"Views\\LanJu_Material.xaml.cs"},{"SourceFile":"Views\\LanJu_Operator.xaml.cs"},{"SourceFile":"Views\\LanJu_Paused.xaml.cs"},{"SourceFile":"Views\\LanJu_Prepare.xaml.cs"},{"SourceFile":"App.xaml.cs"},{"SourceFile":"MainWindow.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\MainWindow.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Complete.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_DeviceItems.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Flow.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Index.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Material.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Operator.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Paused.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Prepare.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\App.g.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","OutputItemRelativePath":"LanJu.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.pdb","OutputItemRelativePath":"LanJu.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu","ProjectFileName":"LanJu.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Views\\LanJu_Complete.xaml.cs"},{"SourceFile":"Views\\LanJu_DeviceItems.xaml.cs"},{"SourceFile":"Views\\LanJu_Flow.xaml.cs"},{"SourceFile":"Views\\LanJu_Index.xaml.cs"},{"SourceFile":"Views\\LanJu_Material.xaml.cs"},{"SourceFile":"Views\\LanJu_Operator.xaml.cs"},{"SourceFile":"Views\\LanJu_Paused.xaml.cs"},{"SourceFile":"Views\\LanJu_Prepare.xaml.cs"},{"SourceFile":"App.xaml.cs"},{"SourceFile":"MainWindow.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\MainWindow.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Complete.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_DeviceItems.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Flow.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Index.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Material.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Operator.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Paused.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\Views\\LanJu_Prepare.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\obj\\Debug\\App.g.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","OutputItemRelativePath":"LanJu.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/LanJuControl/.vs/LanJuControl.csproj.dtbcache.json b/shangjian/LanJuControl/.vs/LanJuControl.csproj.dtbcache.json
index a085915..7e5ee27 100644
--- a/shangjian/LanJuControl/.vs/LanJuControl.csproj.dtbcache.json
+++ b/shangjian/LanJuControl/.vs/LanJuControl.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl","ProjectFileName":"LanJuControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.exe","OutputItemRelativePath":"LanJuControl.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.pdb","OutputItemRelativePath":"LanJuControl.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuControl","ProjectFileName":"LanJuControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.exe","OutputItemRelativePath":"LanJuControl.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/LanJuLib/.vs/LanJuLib.csproj.dtbcache.json b/shangjian/LanJuLib/.vs/LanJuLib.csproj.dtbcache.json
index 71f2fc1..7eea22d 100644
--- a/shangjian/LanJuLib/.vs/LanJuLib.csproj.dtbcache.json
+++ b/shangjian/LanJuLib/.vs/LanJuLib.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib","ProjectFileName":"LanJuLib.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DataConfig\\ConnectionConfig.cs"},{"SourceFile":"DataConfig\\DatabaseConfig.cs"},{"SourceFile":"DataConfig\\DataCache.cs"},{"SourceFile":"DataConfig\\SqlDataObject.cs"},{"SourceFile":"DbHelperSQL.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SecurityHelper\\DESProvider.cs"},{"SourceFile":"SecurityHelper\\MD5Provider.cs"},{"SourceFile":"WorkOrder.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Data.SqlClient.4.8.5\\lib\\net461\\System.Data.SqlClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.dll","OutputItemRelativePath":"LanJuLib.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.pdb","OutputItemRelativePath":"LanJuLib.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuLib","ProjectFileName":"LanJuLib.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DataConfig\\ConnectionConfig.cs"},{"SourceFile":"DataConfig\\DatabaseConfig.cs"},{"SourceFile":"DataConfig\\DataCache.cs"},{"SourceFile":"DataConfig\\SqlDataObject.cs"},{"SourceFile":"DbHelperSQL.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SecurityHelper\\DESProvider.cs"},{"SourceFile":"SecurityHelper\\MD5Provider.cs"},{"SourceFile":"WorkOrder.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Data.SqlClient.4.8.5\\lib\\net461\\System.Data.SqlClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.dll","OutputItemRelativePath":"LanJuLib.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/RestartApp/.vs/RestartApp.csproj.dtbcache.json b/shangjian/RestartApp/.vs/RestartApp.csproj.dtbcache.json
index 03feff4..640620f 100644
--- a/shangjian/RestartApp/.vs/RestartApp.csproj.dtbcache.json
+++ b/shangjian/RestartApp/.vs/RestartApp.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\RestartApp","ProjectFileName":"RestartApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"RestartApp.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"update.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\HtmlAgilityPack.1.11.54\\lib\\Net45\\HtmlAgilityPack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\RestartApp\\bin\\Debug\\RestartApp.exe","OutputItemRelativePath":"RestartApp.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\RestartApp\\bin\\Debug\\RestartApp.pdb","OutputItemRelativePath":"RestartApp.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\RestartApp","ProjectFileName":"RestartApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"RestartApp.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"update.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\HtmlAgilityPack.1.11.54\\lib\\Net45\\HtmlAgilityPack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\RestartApp\\bin\\Debug\\RestartApp.exe","OutputItemRelativePath":"RestartApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/RestartApp/bin/Debug/RestartApp.exe b/shangjian/RestartApp/bin/Debug/RestartApp.exe
index 91c28084599a2fdd0598f1f5a4d75e83b66fbbe0..1f1bc302e642bbc6a495c64d72274986bc5ab565 100644
GIT binary patch
delta 186
zcmZp0X>gg)!6LySGjC##4CASZE5jMfCo?kEGhUe72qaf;W@Hi<5y)mOo#At+%y-(%
ziC6E27@pXyA+~^tms>kvGXoGX0de)@s}kDQsRysw|7(nQpS^$a&CK+(PZ)tRE><z+
z`9;~8dFk<qMX8A~1x5K;smUcV&z7~k=<j;6qwC4u-e+@mO;(e%;hk>|G7kcFPR^H<
gW?VhFTT*NCHc6Mwd{Vzyna-GR7F2l8IMIL|02bRs)Bpeg

delta 176
zcmZp0X>gg)!E!?L@3)CPGK||Mt_){Pn#{;p&$wrDBaoc7nUP6cL_q4UiiMh^g5#_?
z3q-$q+sSR#5L>{+>odLl76TA40dd;os}kC3>(%snGB(`sUD4X1!04T}oe?PGVigmV
zT998H6P{m`9bAx@oI2TB(nhGu9HbQjmVnp_6BWf6r%hfUsl~?dUzI_@VX~k?@Mb=#
SU#v_!%r^@vyl0$fzzzTqR5h>w

diff --git a/shangjian/RestartApp/bin/Debug/RestartApp.pdb b/shangjian/RestartApp/bin/Debug/RestartApp.pdb
index 8d2faac2c736ffe4e8aaab6352897c61a6bb5735..91842ff6d3366e4542f86898ed2476d0bbea8eb6 100644
GIT binary patch
delta 2075
zcmZp;!`N_#aRZA`L==OKAU^{G13M5y01JZ;iv+{w&CbdSx(X(GhK70uy2g4&CMISE
zddAwOW+s-#=4Pn|sitYBDM`lWCdP@DCW&T7Ne1S|X-3J(sU}IOrYV*i9hWd}65-&|
z(PIW0>tYpCo?n!mnU@})Sd^L=Q&5zjm6}`<^K4nmi~g=BJG!3i?R_?9*W`zC5|eG@
zxs6H-QW8s2^^%Jj7*dGVsyw;dhfAGAt0sBzsS|I7i3$nc@FZ5T^5pIEcEl={m@K29
zNvvY!$@6@r83iXg3TuS|qhS>gGciJ<IfaRV;Uo})xM2_>hA1HCKI7yI3LTS_eCpMq
zq97d_K(_QF1IAxPT~jlFY>-JH6G3vRKpF->Cc@Mn+2Y>-QVX&Pq!uKHtQKS|OzlD!
zjawkKAlHD@0_F5j6yHa3#K&V#CxaA&oC{J6l1ts_$j-P)g-3`BBnkp4Oq&^lUNLU6
zC}3h-wYku0GdJU&$*OMe851TtN^drBpTKBr2UHpYRC*JLNlZ6}h$KpyPB)TLsEmRd
zN$P=_XOq_&#z{UhjBh8)`q&VkP`Z62h*fN8q+eW=te=*dlUl4#eC7cqbL+`*zI?>m
z14_N>uB)^`vB|*D1;ji+{1%9Lfmj%bVWk!;kj(|eY(Ojp#2i3e3yfSoAPv&ay_w5z
z5#yu)4#iAhBD4UCOlE=5KqeTp0gEXXppKNyngPmeLow|~sIZ_U@Yo5g#-PN#28a!T
zJ|iuea+96FxhFd$3lbZ}pyHn79I=@%Wgakzvq*Al2W$rVj3M>lHT!>!@$R$tFTR<X
Te)h>|(#J^pSwtoMtn17GAsEl?

delta 1506
zcmZp;!`N_#aRZA`co>6?AU^{G13M5y01JZxvp7THeP?9_T?G?83q1o}b3G$tQ*$Fd
zLv8aUb5lzT!{jvMq!d#lgCq;H)MS&?6a$0QWJ6Q4WQ(L^6N^-n)TE7$OBpwbaBzvY
zF#%0=v5E;wEyyp93C}Oe4lYPcPMvJ%r93%Yj*q_xEM5*2FNTUsO!k%Mp1i<^O9-nr
zL!lI_80@-a__5itLEa9hEv5=~SoOU3l*Vlh_hflRb)_;!1_m}Db^!VhNHH`3u_F*4
z2I6Nx0W+qFj#87G6ze7iteB+alV}4J2LX^i4InN3$bj+Vv8R(WfNYpKAh}eKA}9cv
z1ylR0sB0=nZ37TH05M1oS*_XRMkQfMkj)@jGhnbI%Q{Y8t0c||l5qs$)QyhpjGI(=
zgg8MqgTS-RjaK!H69aNKSrjlaHf%1m+RV+EF<I5^J!8y7N9oN5?h_d0{sR@-1Mzww
z#u_)uGNlD6i6yCe$;CJnOx_@GjXhqKC%^ZULywHjhF<4^t_qptBf~gzvaF8{&X`=_
zBY{Isax$+k?sR6VU_E&*9(j31>B+o)Jg$$#fu05eZ6M|bVqqW#<(X0-<^f_5U<G0>
zAZ7z%DIn$mVo)^k0<j%1p!qh(`7Hu_CxAmy6c|GmKnZ&m2n}R{!9Acj3s7;wX3YR)
zwn3O|B2-vVQbz0qRyk0rXaeF-KuliBFvOKA@Fp1P%}HMKAPIy;(r0@4El_e^ucp_N
bvEhdAiq;MVM(?!k!ztlp5tVSVt}_Dw+@E`F

diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache
index 1558ee7..f3f1a73 100644
--- a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache
+++ b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0f83b8d4b5eccd2a91f969c70fa1ff3e934fb37d2edb72b84bfa358900d806b4
+e211a9e640790a0c8f79c10b0dc76dec1c4e718c6b3821aaa7db93f9b4d9caad
diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt
index 096f81e..8b8e570 100644
--- a/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt
+++ b/shangjian/RestartApp/obj/Debug/RestartApp.csproj.FileListAbsolute.txt
@@ -9,3 +9,14 @@ D:\Repos\WorkSpace\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.csproj
 D:\Repos\WorkSpace\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.csproj.CopyComplete
 D:\Repos\WorkSpace\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.exe
 D:\Repos\WorkSpace\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.pdb
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\bin\Debug\RestartApp.exe.config
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\bin\Debug\RestartApp.exe
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\bin\Debug\RestartApp.pdb
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\bin\Debug\HtmlAgilityPack.dll
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\bin\Debug\HtmlAgilityPack.pdb
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\bin\Debug\HtmlAgilityPack.xml
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.csproj.AssemblyReference.cache
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.csproj.CoreCompileInputs.cache
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.csproj.Up2Date
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.exe
+D:\working_area\project\榄菊上位机\lanju-client\shangjian\RestartApp\obj\Debug\RestartApp.pdb
diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.exe b/shangjian/RestartApp/obj/Debug/RestartApp.exe
index 91c28084599a2fdd0598f1f5a4d75e83b66fbbe0..1f1bc302e642bbc6a495c64d72274986bc5ab565 100644
GIT binary patch
delta 186
zcmZp0X>gg)!6LySGjC##4CASZE5jMfCo?kEGhUe72qaf;W@Hi<5y)mOo#At+%y-(%
ziC6E27@pXyA+~^tms>kvGXoGX0de)@s}kDQsRysw|7(nQpS^$a&CK+(PZ)tRE><z+
z`9;~8dFk<qMX8A~1x5K;smUcV&z7~k=<j;6qwC4u-e+@mO;(e%;hk>|G7kcFPR^H<
gW?VhFTT*NCHc6Mwd{Vzyna-GR7F2l8IMIL|02bRs)Bpeg

delta 176
zcmZp0X>gg)!E!?L@3)CPGK||Mt_){Pn#{;p&$wrDBaoc7nUP6cL_q4UiiMh^g5#_?
z3q-$q+sSR#5L>{+>odLl76TA40dd;os}kC3>(%snGB(`sUD4X1!04T}oe?PGVigmV
zT998H6P{m`9bAx@oI2TB(nhGu9HbQjmVnp_6BWf6r%hfUsl~?dUzI_@VX~k?@Mb=#
SU#v_!%r^@vyl0$fzzzTqR5h>w

diff --git a/shangjian/RestartApp/obj/Debug/RestartApp.pdb b/shangjian/RestartApp/obj/Debug/RestartApp.pdb
index 8d2faac2c736ffe4e8aaab6352897c61a6bb5735..91842ff6d3366e4542f86898ed2476d0bbea8eb6 100644
GIT binary patch
delta 2075
zcmZp;!`N_#aRZA`L==OKAU^{G13M5y01JZ;iv+{w&CbdSx(X(GhK70uy2g4&CMISE
zddAwOW+s-#=4Pn|sitYBDM`lWCdP@DCW&T7Ne1S|X-3J(sU}IOrYV*i9hWd}65-&|
z(PIW0>tYpCo?n!mnU@})Sd^L=Q&5zjm6}`<^K4nmi~g=BJG!3i?R_?9*W`zC5|eG@
zxs6H-QW8s2^^%Jj7*dGVsyw;dhfAGAt0sBzsS|I7i3$nc@FZ5T^5pIEcEl={m@K29
zNvvY!$@6@r83iXg3TuS|qhS>gGciJ<IfaRV;Uo})xM2_>hA1HCKI7yI3LTS_eCpMq
zq97d_K(_QF1IAxPT~jlFY>-JH6G3vRKpF->Cc@Mn+2Y>-QVX&Pq!uKHtQKS|OzlD!
zjawkKAlHD@0_F5j6yHa3#K&V#CxaA&oC{J6l1ts_$j-P)g-3`BBnkp4Oq&^lUNLU6
zC}3h-wYku0GdJU&$*OMe851TtN^drBpTKBr2UHpYRC*JLNlZ6}h$KpyPB)TLsEmRd
zN$P=_XOq_&#z{UhjBh8)`q&VkP`Z62h*fN8q+eW=te=*dlUl4#eC7cqbL+`*zI?>m
z14_N>uB)^`vB|*D1;ji+{1%9Lfmj%bVWk!;kj(|eY(Ojp#2i3e3yfSoAPv&ay_w5z
z5#yu)4#iAhBD4UCOlE=5KqeTp0gEXXppKNyngPmeLow|~sIZ_U@Yo5g#-PN#28a!T
zJ|iuea+96FxhFd$3lbZ}pyHn79I=@%Wgakzvq*Al2W$rVj3M>lHT!>!@$R$tFTR<X
Te)h>|(#J^pSwtoMtn17GAsEl?

delta 1506
zcmZp;!`N_#aRZA`co>6?AU^{G13M5y01JZxvp7THeP?9_T?G?83q1o}b3G$tQ*$Fd
zLv8aUb5lzT!{jvMq!d#lgCq;H)MS&?6a$0QWJ6Q4WQ(L^6N^-n)TE7$OBpwbaBzvY
zF#%0=v5E;wEyyp93C}Oe4lYPcPMvJ%r93%Yj*q_xEM5*2FNTUsO!k%Mp1i<^O9-nr
zL!lI_80@-a__5itLEa9hEv5=~SoOU3l*Vlh_hflRb)_;!1_m}Db^!VhNHH`3u_F*4
z2I6Nx0W+qFj#87G6ze7iteB+alV}4J2LX^i4InN3$bj+Vv8R(WfNYpKAh}eKA}9cv
z1ylR0sB0=nZ37TH05M1oS*_XRMkQfMkj)@jGhnbI%Q{Y8t0c||l5qs$)QyhpjGI(=
zgg8MqgTS-RjaK!H69aNKSrjlaHf%1m+RV+EF<I5^J!8y7N9oN5?h_d0{sR@-1Mzww
z#u_)uGNlD6i6yCe$;CJnOx_@GjXhqKC%^ZULywHjhF<4^t_qptBf~gzvaF8{&X`=_
zBY{Isax$+k?sR6VU_E&*9(j31>B+o)Jg$$#fu05eZ6M|bVqqW#<(X0-<^f_5U<G0>
zAZ7z%DIn$mVo)^k0<j%1p!qh(`7Hu_CxAmy6c|GmKnZ&m2n}R{!9Acj3s7;wX3YR)
zwn3O|B2-vVQbz0qRyk0rXaeF-KuliBFvOKA@Fp1P%}HMKAPIy;(r0@4El_e^ucp_N
bvEhdAiq;MVM(?!k!ztlp5tVSVt}_Dw+@E`F

diff --git a/shangjian/WPFupdate/.vs/WPFupdate.csproj.dtbcache.json b/shangjian/WPFupdate/.vs/WPFupdate.csproj.dtbcache.json
index 3006224..093fca4 100644
--- a/shangjian/WPFupdate/.vs/WPFupdate.csproj.dtbcache.json
+++ b/shangjian/WPFupdate/.vs/WPFupdate.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate","ProjectFileName":"WPFupdate.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"WPFupdate1.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"update.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\HtmlAgilityPack.1.11.54\\lib\\Net45\\HtmlAgilityPack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","OutputItemRelativePath":"WPFupdate.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.pdb","OutputItemRelativePath":"WPFupdate.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\WPFupdate","ProjectFileName":"WPFupdate.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"WPFupdate1.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"update.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\HtmlAgilityPack.1.11.54\\lib\\Net45\\HtmlAgilityPack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","OutputItemRelativePath":"WPFupdate.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/XGL.Data/.vs/XGL.Data.csproj.dtbcache.json b/shangjian/XGL.Data/.vs/XGL.Data.csproj.dtbcache.json
index ba91b10..86b4ffe 100644
--- a/shangjian/XGL.Data/.vs/XGL.Data.csproj.dtbcache.json
+++ b/shangjian/XGL.Data/.vs/XGL.Data.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Data","ProjectFileName":"XGL.Data.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"basedata_carrealinfoDb.cs"},{"SourceFile":"basedata_dictionaryDb.cs"},{"SourceFile":"basedata_linecatchareaDb.cs"},{"SourceFile":"basedata_materialbomDb.cs"},{"SourceFile":"basedata_materialinfoDb.cs"},{"SourceFile":"basedata_nodeprecussDb.cs"},{"SourceFile":"basedata_nodesettingDb.cs"},{"SourceFile":"basedata_orderplanDb.cs"},{"SourceFile":"basedata_plcsettingDb.cs"},{"SourceFile":"common_auth_moduleDb.cs"},{"SourceFile":"common_auth_modulepermissionDb.cs"},{"SourceFile":"common_auth_permissionDb.cs"},{"SourceFile":"common_auth_roleDb.cs"},{"SourceFile":"common_auth_rolemodulepermissionDB.cs"},{"SourceFile":"common_auth_userDB.cs"},{"SourceFile":"common_auth_userroleDB.cs"},{"SourceFile":"data_carmaterialDb.cs"},{"SourceFile":"data_carproductDb.cs"},{"SourceFile":"DBServiceFinishProd\\FinishProdDBService.cs"},{"SourceFile":"DBService\\DBService.cs"},{"SourceFile":"DBService\\DringRoomService.cs"},{"SourceFile":"DBService\\FormingMachineService.cs"},{"SourceFile":"DBService\\MESDBService.cs"},{"SourceFile":"filedatasDb.cs"},{"SourceFile":"permissionDB.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"roleDB.cs"},{"SourceFile":"rolepermissionDB.cs"},{"SourceFile":"sysconfig_operatelogDb.cs"},{"SourceFile":"sysnoticesDb.cs"},{"SourceFile":"userDB.cs"},{"SourceFile":"userroleDB.cs"},{"SourceFile":"workdata_suspendinfoDb.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Controls.Ribbon.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","OutputItemRelativePath":"XGL.Data.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.pdb","OutputItemRelativePath":"XGL.Data.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data","ProjectFileName":"XGL.Data.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"basedata_carrealinfoDb.cs"},{"SourceFile":"basedata_dictionaryDb.cs"},{"SourceFile":"basedata_linecatchareaDb.cs"},{"SourceFile":"basedata_materialbomDb.cs"},{"SourceFile":"basedata_materialinfoDb.cs"},{"SourceFile":"basedata_nodeprecussDb.cs"},{"SourceFile":"basedata_nodesettingDb.cs"},{"SourceFile":"basedata_orderplanDb.cs"},{"SourceFile":"basedata_plcsettingDb.cs"},{"SourceFile":"common_auth_moduleDb.cs"},{"SourceFile":"common_auth_modulepermissionDb.cs"},{"SourceFile":"common_auth_permissionDb.cs"},{"SourceFile":"common_auth_roleDb.cs"},{"SourceFile":"common_auth_rolemodulepermissionDB.cs"},{"SourceFile":"common_auth_userDB.cs"},{"SourceFile":"common_auth_userroleDB.cs"},{"SourceFile":"data_carmaterialDb.cs"},{"SourceFile":"data_carproductDb.cs"},{"SourceFile":"DBServiceFinishProd\\FinishProdDBService.cs"},{"SourceFile":"DBService\\DBService.cs"},{"SourceFile":"DBService\\DringRoomService.cs"},{"SourceFile":"DBService\\FormingMachineService.cs"},{"SourceFile":"DBService\\MESDBService.cs"},{"SourceFile":"filedatasDb.cs"},{"SourceFile":"permissionDB.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"roleDB.cs"},{"SourceFile":"rolepermissionDB.cs"},{"SourceFile":"sysconfig_operatelogDb.cs"},{"SourceFile":"sysnoticesDb.cs"},{"SourceFile":"userDB.cs"},{"SourceFile":"userroleDB.cs"},{"SourceFile":"workdata_suspendinfoDb.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Controls.Ribbon.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","OutputItemRelativePath":"XGL.Data.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs
index b62af84..1501949 100644
--- a/shangjian/XGL.Data/DBService/FormingMachineService.cs
+++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 using XGL.Models;
 using XGL.Models.Model.FoamingMac;
+using static Snap7.S7Client;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace XGL.Data.DBService
@@ -108,6 +109,14 @@ namespace XGL.Data.DBService
             return null;
         }
 
+        public string GetShiftById(string shiftCode)
+        {
+            string sql = $@"select shift_desc from base_shifts_t where del_flag ='0' and Shift_Id = '{shiftCode}'";
+            var obj = Utils.netClientDBHelper.getScalar(sql, null);
+            string issucc = obj == null ? "" : obj.ToString();
+            return issucc;
+        }
+
         public DataTable GetTeamList()
         {
             string sql = $@"SELECT team_id,team_code,team_desc FROM [dbo].[base_team_t] where del_flag ='0' ";
@@ -1544,6 +1553,57 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
             return list;
         }
 
+        public List<MesTableSelfDetialModel> GetMesTableSelfDetialByShiftCode(string id,string shiftCode, int count)
+        {
+            string sql = $@"select * from [dbo].[mes_table_self_detial] where belong_to='{id}' and remark = '{shiftCode}' and CONVERT(date, create_time) = CONVERT(date, GETDATE())";
+            DataSet ds = Utils.netClientDBHelper.getDataSet(sql);
+            List<MesTableSelfDetialModel> list = new List<MesTableSelfDetialModel>();
+            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+            {
+                foreach (DataRow dr in ds.Tables[0].Rows)
+                {
+                    int dable_line = 0;
+                    try
+                    {
+                        dable_line = int.Parse(dr["table_line"].ToString());
+                    }
+                    catch
+                    {
+
+                    }
+                    list.Add(new MesTableSelfDetialModel()
+                    {
+                        id = dr["id"].ToString(),
+                        belong_to = dr["belong_to"].ToString(),
+                        remark = dr["remark"].ToString(),
+                        bz = dr["bz"].ToString(),
+                        factory_code = dr["factory_code"].ToString(),
+                        del_flag = dr["del_flag"].ToString(),
+                        check_time_s = dr["check_time_s"].ToString(),
+                        check_time_e = dr["check_time_e"].ToString(),
+                        check_result = dr["check_result"].ToString(),
+                        info_code = dr["info_code"].ToString(),
+                        info_name = dr["info_name"].ToString(),
+                        table_line = dable_line,
+                    });
+                }
+                list = list.OrderByDescending(t => t.table_line).ToList();
+                var distinctList = list.OrderByDescending(t => t.table_line).Select(t => t.table_line).Distinct().ToList();
+                for (int i = 0; i < distinctList.Count; i++)
+                {
+                    list.Where(t => t.table_line == distinctList[i]).ToList().ForEach(t =>
+                    {
+                        t.index = i;
+                    });
+                    if (i > count)
+                    {
+                        list.RemoveAll(t => t.table_line == distinctList[i]);
+                    }
+                }
+            }
+            return list;
+        }
+
         public int InsertMesTableSelfDetial(MesTableSelfDetialModel model)
         {
             string sql = $@"insert into [dbo].[mes_table_self_detial] (id,table_line,belong_to,remark,bz,factory_code,del_flag,check_time_s,check_time_e,check_result,info_code,info_name,create_time) values ('{model.id}','{model.table_line}','{model.belong_to}','{model.remark}','{model.bz}','{model.factory_code}','{model.del_flag}','{model.check_time_s}','{model.check_time_e}','{model.check_result}','{model.info_code}','{model.info_name}',GetDate())";
diff --git a/shangjian/XGL.Model/.vs/XGL.Models.csproj.dtbcache.json b/shangjian/XGL.Model/.vs/XGL.Models.csproj.dtbcache.json
index bd6b3c5..39e497f 100644
--- a/shangjian/XGL.Model/.vs/XGL.Models.csproj.dtbcache.json
+++ b/shangjian/XGL.Model/.vs/XGL.Models.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model","ProjectFileName":"XGL.Models.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"basedata_carrealinfoModel.cs"},{"SourceFile":"basedata_dictionaryModel.cs"},{"SourceFile":"basedata_linecatchareaModel.cs"},{"SourceFile":"basedata_materialbomModel.cs"},{"SourceFile":"basedata_materialinfoModel.cs"},{"SourceFile":"basedata_nodeprecussModel.cs"},{"SourceFile":"basedata_nodesettingModel.cs"},{"SourceFile":"basedata_orderplanModel.cs"},{"SourceFile":"basedata_plcsettingModel.cs"},{"SourceFile":"CheckTaskDetailModel.cs"},{"SourceFile":"common_auth_moduleModel.cs"},{"SourceFile":"common_auth_modulepermissionModel.cs"},{"SourceFile":"common_auth_permissionModel.cs"},{"SourceFile":"common_auth_roleModel.cs"},{"SourceFile":"common_auth_rolemodulepermissionModel.cs"},{"SourceFile":"common_auth_userModel.cs"},{"SourceFile":"common_auth_userroleModel.cs"},{"SourceFile":"data_carmaterialModel.cs"},{"SourceFile":"data_carproductModel.cs"},{"SourceFile":"filedatasModel.cs"},{"SourceFile":"Model\\BaseEquipment.cs"},{"SourceFile":"Model\\BaseEquipmentAttached.cs"},{"SourceFile":"Model\\CarRealInfo.cs"},{"SourceFile":"Model\\CarMaterial.cs"},{"SourceFile":"Model\\CarProduct.cs"},{"SourceFile":"Model\\FoamingMac\\FoamingMacModel.cs"},{"SourceFile":"Model\\LineCatchArea.cs"},{"SourceFile":"Model\\LinePreInfo.cs"},{"SourceFile":"Model\\MachineRepairModel.cs"},{"SourceFile":"Model\\MaterialBom.cs"},{"SourceFile":"Model\\MaterialInfo.cs"},{"SourceFile":"Model\\MesViewData.cs"},{"SourceFile":"Model\\new_materialModel.cs"},{"SourceFile":"Model\\NodePrecuss.cs"},{"SourceFile":"Model\\NodeSetting.cs"},{"SourceFile":"Model\\OffLineMaterialList.cs"},{"SourceFile":"Model\\OffProductInfo.cs"},{"SourceFile":"Model\\Orderplan.cs"},{"SourceFile":"Model\\OrderPrepare\\MaterialPlanModel.cs"},{"SourceFile":"Model\\OrderPrepare\\WcsSyncResult.cs"},{"SourceFile":"Model\\OrderPrepare\\WetMaterialModel.cs"},{"SourceFile":"Model\\PlcSetting.cs"},{"SourceFile":"Model\\Productinfo.cs"},{"SourceFile":"Model\\ResultJson.cs"},{"SourceFile":"Model\\sys_user.cs"},{"SourceFile":"Model\\UpLineMaterialList.cs"},{"SourceFile":"Model\\UpLineScanCarList.cs"},{"SourceFile":"permission.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"role.cs"},{"SourceFile":"rolepermission.cs"},{"SourceFile":"ShiftInfoModel.cs"},{"SourceFile":"sysconfig_operatelogModel.cs"},{"SourceFile":"sysnoticesModel.cs"},{"SourceFile":"user.cs"},{"SourceFile":"userrole.cs"},{"SourceFile":"vbasedata_orderplanModel.cs"},{"SourceFile":"workdata_suspendinfoModel.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","OutputItemRelativePath":"XGL.Models.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.pdb","OutputItemRelativePath":"XGL.Models.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model","ProjectFileName":"XGL.Models.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"basedata_carrealinfoModel.cs"},{"SourceFile":"basedata_dictionaryModel.cs"},{"SourceFile":"basedata_linecatchareaModel.cs"},{"SourceFile":"basedata_materialbomModel.cs"},{"SourceFile":"basedata_materialinfoModel.cs"},{"SourceFile":"basedata_nodeprecussModel.cs"},{"SourceFile":"basedata_nodesettingModel.cs"},{"SourceFile":"basedata_orderplanModel.cs"},{"SourceFile":"basedata_plcsettingModel.cs"},{"SourceFile":"CheckTaskDetailModel.cs"},{"SourceFile":"common_auth_moduleModel.cs"},{"SourceFile":"common_auth_modulepermissionModel.cs"},{"SourceFile":"common_auth_permissionModel.cs"},{"SourceFile":"common_auth_roleModel.cs"},{"SourceFile":"common_auth_rolemodulepermissionModel.cs"},{"SourceFile":"common_auth_userModel.cs"},{"SourceFile":"common_auth_userroleModel.cs"},{"SourceFile":"data_carmaterialModel.cs"},{"SourceFile":"data_carproductModel.cs"},{"SourceFile":"filedatasModel.cs"},{"SourceFile":"Model\\BaseEquipment.cs"},{"SourceFile":"Model\\BaseEquipmentAttached.cs"},{"SourceFile":"Model\\CarRealInfo.cs"},{"SourceFile":"Model\\CarMaterial.cs"},{"SourceFile":"Model\\CarProduct.cs"},{"SourceFile":"Model\\FoamingMac\\FoamingMacModel.cs"},{"SourceFile":"Model\\LineCatchArea.cs"},{"SourceFile":"Model\\LinePreInfo.cs"},{"SourceFile":"Model\\MachineRepairModel.cs"},{"SourceFile":"Model\\MaterialBom.cs"},{"SourceFile":"Model\\MaterialInfo.cs"},{"SourceFile":"Model\\MesViewData.cs"},{"SourceFile":"Model\\new_materialModel.cs"},{"SourceFile":"Model\\NodePrecuss.cs"},{"SourceFile":"Model\\NodeSetting.cs"},{"SourceFile":"Model\\OffLineMaterialList.cs"},{"SourceFile":"Model\\OffProductInfo.cs"},{"SourceFile":"Model\\Orderplan.cs"},{"SourceFile":"Model\\OrderPrepare\\MaterialPlanModel.cs"},{"SourceFile":"Model\\OrderPrepare\\WcsSyncResult.cs"},{"SourceFile":"Model\\OrderPrepare\\WetMaterialModel.cs"},{"SourceFile":"Model\\PlcSetting.cs"},{"SourceFile":"Model\\Productinfo.cs"},{"SourceFile":"Model\\ResultJson.cs"},{"SourceFile":"Model\\sys_user.cs"},{"SourceFile":"Model\\UpLineMaterialList.cs"},{"SourceFile":"Model\\UpLineScanCarList.cs"},{"SourceFile":"permission.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"report.cs"},{"SourceFile":"role.cs"},{"SourceFile":"rolepermission.cs"},{"SourceFile":"ShiftInfoModel.cs"},{"SourceFile":"sysconfig_operatelogModel.cs"},{"SourceFile":"sysnoticesModel.cs"},{"SourceFile":"user.cs"},{"SourceFile":"userrole.cs"},{"SourceFile":"vbasedata_orderplanModel.cs"},{"SourceFile":"workdata_suspendinfoModel.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","OutputItemRelativePath":"XGL.Models.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/XGL.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/shangjian/XGL.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
new file mode 100644
index 0000000..15efebf
--- /dev/null
+++ b/shangjian/XGL.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache
new file mode 100644
index 0000000000000000000000000000000000000000..8bebce61e85f5ca810d6480a5edd189d56dd1e0e
GIT binary patch
literal 9241
zcmds6eQXnD81E}{8yjC6jxW(Q1`L>S*Fjgx6mWLTFzLjVAnK9jdVSm7dVR0Ey8@jM
zh*Kk&Nn+GV*dLG>P&9s^K|){{g<xXTU;qIjd`Ji}VnX}?gsAU(y<0ztG=0xBUb42g
zw|)9N@9+8jp67X63aV^28|d&fa*Gu?r0@}Yizq?WK5doTHJxjRL8w3^Kzoy_!iZlI
zp~`thL6KECsBta${cxqMggK^d!II?N3Mb>{BB~%OlIUjwk^}($7F*x)O=or<E4S%4
z;7<IX5lB`dVgT_BlA@L51_gzb*8%cce-jFZ^#$`rUjY^Pn;gt6$E^A}Ht=kqkt5EC
zDAd6#kmsU`+yw=VySVN7OB**_*uCMxzP^hCdpL<lU9lMg4hCtQ+R39(m&hY7$_rsW
zgadq3mO~O`@P=rzKNe(WF%3*TheP2I)SL}j>t=wLexK1$#-A<+0F2JC0fymdNyK{W
z#xr>h*5Zefb%_Pg3xas}8(EeOG_t9&utqFwMl5V<EbLG$tQiZN;YT7C7RSQsv1F~2
zShm>kH6`KJYxrg99f|vPUsJuUgt!W9Q`e2&dsEoDI{5Lh9hWMHZ5!M%KD=x2TJNAo
zexN3P`S^(Q^Ul;vs$F!s|AXFlzkaj2tfcnn&XW%=>}|Pu^Tfh2N7<>q)vcay<`0fP
zwZ?Pts~@}@s~<VFYv1OlN(Z%*eLL1D>#lb@ex0yYD%*2qLht4p|E9NIxbOO(=VwoT
z10H;TU>7LIK5hRF!aWC$m4Nn)Fzf6~p`wa1nyX{SIO^=4n54xNI2XZ~rtngoeQ^w@
zv+x*<FOkC#&E;nYX1W?&4Srs523!s&HgD5W!)TV9xeRdhIWHYXvXa18_wLgkZs|nl
z+4cGdu$59@T-9KtARCnl8;nO*U;&17PgBSPz{oTP>!wM%{%u?s@@`u6^2UAL64T6U
zJmX^ASSd_qIk=Q1lT;_0Uo}Zpkz59)*g28{<d0lBm&kJ(pW?LXl=L9s`w){HY|7H@
zlIVoG@15H2Slz1WP51Y=Hf?#)Gw!+WKRQ0U@z9YD*tey2@Ajt;JsdjxO3#feEo*w7
z7&trS<+0uU<EP#I$>}3Me?Mv2$iIeHpZP+pyl2XxbN$a;{pG}{){ol8EWY>hRbl_N
z_w0|q&JEOj{%zZSC>)<ziQYc^le^4c-}Kw=Nk3LdFNNow)6?`|=h`pViwC^Gn~WgI
zA046F;g8VZa?cJ5ZucD59Kq=f=%5TIh!hilMj8BRR``{;PUJ<Q59fERtvXuKNFpOq
znOr29oR^_YVHj&TwM5~O$_pCSEwvznlZR9S1;tQI;fYCRAyPFS%X>Z=mKk$}VR>03
zKRcNr-<8Y5f;_7-EP8o_i+BW=_5#f52>+Wtk~gL3<8ljnC?h6Q3zHobX(y-=i#`~1
z(j*fF8(3}K9(&|SR7N;$ymA00%2N|UvZixK&C$dX8c~CQMsGkLMpNM^cN;bkwi3rw
z&C6zv-h>xZNut9QJaQOf;e$d<5w&;$@|Ub_)R9;JE98x8mxH+f+YB(vetQgQVgxci
zsEE8I_UICpS32CPTt6wIfV@&=TJWS^NQ;uK?9jTrFnYZlnLxFQ7Ndk`@3Un6J~u;E
z451v`O_g{wJ9(PW(V_?dwCj0xGIUy(49PY;M<Ntm>trgYM^0@XXbenML#L%ot4~nG
zs0Jzs5IL?~XGrPu7x_^7nP-=E2&PV>IWVM3X4<I^z(k`PT7WdDL={nmxEihy1(;vi
zO5cAvXLxiPzU*8GT9*rW+-DYvsN3p1ptCh}U@|p<em7;=SfyE)0s3(*dGJAP!72?R
za=LE$SZwZ8!AEQ~D!l0o^_eJS0c^>#<MDO!N;C&^i>?Y&+F$^Ndc!#4BchPk=##Ga
z*(&R|04$?c=^V>Gu_(GjbXqD+{oLC;0%?my@aQY#SL$yy^QQHL1*8%H;|!e5isIpg
zPFg=g6evm-HB8y`;jN<&X;QM;Q*<g<oyvCnOK7qEl#-2^g_1|oHV0@_hYK3DpO)lN
ORVdRKg%jT_(EkArvNs+8

literal 0
HcmV?d00001

diff --git a/shangjian/XGL.Thrift/.vs/XGL.Thrift.csproj.dtbcache.json b/shangjian/XGL.Thrift/.vs/XGL.Thrift.csproj.dtbcache.json
index 3ccf541..659c748 100644
--- a/shangjian/XGL.Thrift/.vs/XGL.Thrift.csproj.dtbcache.json
+++ b/shangjian/XGL.Thrift/.vs/XGL.Thrift.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift","ProjectFileName":"XGL.Thrift.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AreaPlc.cs"},{"SourceFile":"CarArea.cs"},{"SourceFile":"Fault.cs"},{"SourceFile":"LineArea.cs"},{"SourceFile":"MaterielNumKB.cs"},{"SourceFile":"Order.cs"},{"SourceFile":"OutCarLine.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"ThriftCommon.cs"},{"SourceFile":"ThriftService.cs"},{"SourceFile":"ThriftServiceImp.cs"},{"SourceFile":"WorkOrder.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","OutputItemRelativePath":"XGL.Thrift.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.pdb","OutputItemRelativePath":"XGL.Thrift.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift","ProjectFileName":"XGL.Thrift.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AreaPlc.cs"},{"SourceFile":"CarArea.cs"},{"SourceFile":"Fault.cs"},{"SourceFile":"LineArea.cs"},{"SourceFile":"MaterielNumKB.cs"},{"SourceFile":"Order.cs"},{"SourceFile":"OutCarLine.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"ThriftCommon.cs"},{"SourceFile":"ThriftService.cs"},{"SourceFile":"ThriftServiceImp.cs"},{"SourceFile":"WorkOrder.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","OutputItemRelativePath":"XGL.Thrift.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/XGL/.vs/XGL.csproj.dtbcache.json b/shangjian/XGL/.vs/XGL.csproj.dtbcache.json
index e56d451..eee14ff 100644
--- a/shangjian/XGL/.vs/XGL.csproj.dtbcache.json
+++ b/shangjian/XGL/.vs/XGL.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL","ProjectFileName":"XGL.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"APP_Code\\AutoClosedMsgBox.cs"},{"SourceFile":"APP_Code\\BrushHelper.cs"},{"SourceFile":"APP_Code\\CarInfo.cs"},{"SourceFile":"APP_Code\\CommonHelper.cs"},{"SourceFile":"APP_Code\\DESProvider.cs"},{"SourceFile":"APP_Code\\ImageHelper.cs"},{"SourceFile":"APP_Code\\ImageSourceHelper.cs"},{"SourceFile":"APP_Code\\JsonHelper.cs"},{"SourceFile":"APP_Code\\snap7.net.cs"},{"SourceFile":"APP_Code\\StorageData.cs"},{"SourceFile":"APP_Code\\test.cs"},{"SourceFile":"FormItem\\FormBlankingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormBoard.xaml.cs"},{"SourceFile":"FormItem\\FormChargingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormLocator.xaml.cs"},{"SourceFile":"FormItem\\FormOutBoxBoard.xaml.cs"},{"SourceFile":"FormItem\\FormShowSelect.xaml.cs"},{"SourceFile":"FormItem\\Main.xaml.cs"},{"SourceFile":"LoginPageBak.xaml.cs"},{"SourceFile":"snap7.net.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter1.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter.cs"},{"SourceFile":"Tools\\ModuleUC.xaml.cs"},{"SourceFile":"Tools\\OrderInOutConverter.cs"},{"SourceFile":"Tools\\SerialHelper.cs"},{"SourceFile":"Tools\\SyncFlagColorConverter.cs"},{"SourceFile":"Tools\\NetStatusToColorConvert.cs"},{"SourceFile":"Tools\\MyValueConverter.cs"},{"SourceFile":"Tools\\DeviceNameConverter.cs"},{"SourceFile":"Tools\\SyncFlagConverter.cs"},{"SourceFile":"Tools\\UserDatePicker.cs"},{"SourceFile":"UControl\\ordertj.xaml.cs"},{"SourceFile":"UControl\\orderzfzy.xaml.cs"},{"SourceFile":"UControl\\orderzy.xaml.cs"},{"SourceFile":"UControl\\product_order.xaml.cs"},{"SourceFile":"UControl\\product_ordertj.xaml.cs"},{"SourceFile":"UControl\\product_orderzfzy.xaml.cs"},{"SourceFile":"UControl\\product_orderzy.xaml.cs"},{"SourceFile":"UControl\\UCArea.xaml.cs"},{"SourceFile":"UControl\\UCBoard.xaml.cs"},{"SourceFile":"UControl\\UCCar.xaml.cs"},{"SourceFile":"UControl\\UCCarL.xaml.cs"},{"SourceFile":"UControl\\UCLMix.xaml.cs"},{"SourceFile":"UControl\\UCMix.xaml.cs"},{"SourceFile":"UControl\\UCMixR.xaml.cs"},{"SourceFile":"UControl\\UCPermissionList.xaml.cs"},{"SourceFile":"UControl\\UCPostionList.xaml.cs"},{"SourceFile":"UControl\\UCProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCRoleList.xaml.cs"},{"SourceFile":"UControl\\UCRProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCStorage.xaml.cs"},{"SourceFile":"UControl\\UCStorageNew.xaml.cs"},{"SourceFile":"UControl\\UCStorageNewx.xaml.cs"},{"SourceFile":"UControl\\UCTakeOff.xaml.cs"},{"SourceFile":"UControl\\UCUserList.xaml.cs"},{"SourceFile":"Views\\CheckUserWin.xaml.cs"},{"SourceFile":"Views\\Classes.xaml.cs"},{"SourceFile":"Views\\DryingRoomUC.xaml.cs"},{"SourceFile":"Views\\HBLogWin.xaml.cs"},{"SourceFile":"Views\\ProductionData.xaml.cs"},{"SourceFile":"Views\\.xaml.cs"},{"SourceFile":"Views\\ReportForm.xaml.cs"},{"SourceFile":"Views\\ShouPeiWin.xaml.cs"},{"SourceFile":"Views\\SopInfoWin.xaml.cs"},{"SourceFile":"Views\\FlowInfoWin.xaml.cs"},{"SourceFile":"Views\\LanJu_Complete.xaml.cs"},{"SourceFile":"Views\\LanJu_DeviceItems.xaml.cs"},{"SourceFile":"Views\\LanJu_Flow.xaml.cs"},{"SourceFile":"Views\\LanJu_Index.xaml.cs"},{"SourceFile":"Views\\LanJu_InOut.xaml.cs"},{"SourceFile":"Views\\LanJu_Material.xaml.cs"},{"SourceFile":"Views\\LanJu_NowUser.xaml.cs"},{"SourceFile":"Views\\LanJu_Operator.xaml.cs"},{"SourceFile":"Views\\LanJu_Paused.xaml.cs"},{"SourceFile":"Views\\LanJu_Prepare.xaml.cs"},{"SourceFile":"Views\\LanJu_User.xaml.cs"},{"SourceFile":"Views\\LanJu_UserRecord.xaml.cs"},{"SourceFile":"Views\\ViewPlcInfoWin.xaml.cs"},{"SourceFile":"Views\\ViewLogWin.xaml.cs"},{"SourceFile":"Web References\\AutoUpdate\\Reference.cs"},{"SourceFile":"HFstatus.xaml.cs"},{"SourceFile":"App.xaml.cs"},{"SourceFile":"LoginPage.xaml.cs"},{"SourceFile":"MainWindow.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormBlankingBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormChargingBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormLocator.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormOutBoxBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormShowSelect.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\Main.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\LoginPageBak.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\LoginPage.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\MainWindow.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Tools\\ModuleUC.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\ordertj.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\orderzfzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\orderzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_order.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_ordertj.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_orderzfzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_orderzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCArea.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCCar.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCCarL.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCLMix.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCMix.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCMixR.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCPermissionList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCPostionList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCProgressBar.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCRoleList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCRProgressBar.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCStorage.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCStorageNew.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCStorageNewx.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCTakeOff.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCUserList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\CheckUserWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\Classes.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\DryingRoomUC.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\HBLogWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ProductionData.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\FormClassesTime.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ReportForm.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ShouPeiWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\SopInfoWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\FlowInfoWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Complete.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_DeviceItems.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Flow.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Index.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_InOut.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Material.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_NowUser.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Operator.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Paused.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Prepare.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_User.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_UserRecord.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ViewPlcInfoWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ViewLogWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\HFstatus.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\App.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\XGL_Content.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\GeneratedInternalTypeHelper.g.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\HandyControls.3.4.5\\lib\\net48\\HandyControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\SharpZipLib.1.3.3\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\LiveCharts.0.9.7\\lib\\net40\\LiveCharts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\LoadingIndicators.WPF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MaterialDesignColors.2.1.4\\lib\\net462\\MaterialDesignColors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MaterialDesignThemes.4.9.0\\lib\\net462\\MaterialDesignThemes.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.39\\lib\\net45\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\PdfiumViewer.2.13.0.0\\lib\\net20\\PdfiumViewer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\PdfSharpCore.1.3.60\\lib\\netstandard2.0\\PdfSharpCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\SixLabors.Fonts.1.0.0\\lib\\netstandard2.0\\SixLabors.Fonts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\SixLabors.ImageSharp.1.0.4\\lib\\net472\\SixLabors.ImageSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Memory.4.5.4\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Runtime.CompilerServices.Unsafe.4.7.0\\lib\\netstandard2.0\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Speech.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\System.Windows.Interactivity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsFormsIntegration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\WpfCustomControlLibrary1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Aero.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Metro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.VS2010.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.DataGrid.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.Toolkit.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\ZCustomControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\bin\\Debug\\XGL.exe","OutputItemRelativePath":"XGL.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL\\bin\\Debug\\XGL.pdb","OutputItemRelativePath":"XGL.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL","ProjectFileName":"XGL.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"APP_Code\\AutoClosedMsgBox.cs"},{"SourceFile":"APP_Code\\BrushHelper.cs"},{"SourceFile":"APP_Code\\CarInfo.cs"},{"SourceFile":"APP_Code\\CommonHelper.cs"},{"SourceFile":"APP_Code\\DESProvider.cs"},{"SourceFile":"APP_Code\\ImageHelper.cs"},{"SourceFile":"APP_Code\\ImageSourceHelper.cs"},{"SourceFile":"APP_Code\\JsonHelper.cs"},{"SourceFile":"APP_Code\\snap7.net.cs"},{"SourceFile":"APP_Code\\StorageData.cs"},{"SourceFile":"APP_Code\\test.cs"},{"SourceFile":"FormItem\\FormBlankingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormBoard.xaml.cs"},{"SourceFile":"FormItem\\FormChargingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormLocator.xaml.cs"},{"SourceFile":"FormItem\\FormOutBoxBoard.xaml.cs"},{"SourceFile":"FormItem\\FormShowSelect.xaml.cs"},{"SourceFile":"FormItem\\Main.xaml.cs"},{"SourceFile":"LoginPageBak.xaml.cs"},{"SourceFile":"snap7.net.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter1.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter.cs"},{"SourceFile":"Tools\\ModuleUC.xaml.cs"},{"SourceFile":"Tools\\OrderInOutConverter.cs"},{"SourceFile":"Tools\\SerialHelper.cs"},{"SourceFile":"Tools\\SyncFlagColorConverter.cs"},{"SourceFile":"Tools\\NetStatusToColorConvert.cs"},{"SourceFile":"Tools\\MyValueConverter.cs"},{"SourceFile":"Tools\\DeviceNameConverter.cs"},{"SourceFile":"Tools\\SyncFlagConverter.cs"},{"SourceFile":"Tools\\UserDatePicker.cs"},{"SourceFile":"UControl\\ordertj.xaml.cs"},{"SourceFile":"UControl\\orderzfzy.xaml.cs"},{"SourceFile":"UControl\\orderzy.xaml.cs"},{"SourceFile":"UControl\\product_order.xaml.cs"},{"SourceFile":"UControl\\product_ordertj.xaml.cs"},{"SourceFile":"UControl\\product_orderzfzy.xaml.cs"},{"SourceFile":"UControl\\product_orderzy.xaml.cs"},{"SourceFile":"UControl\\UCArea.xaml.cs"},{"SourceFile":"UControl\\UCBoard.xaml.cs"},{"SourceFile":"UControl\\UCCar.xaml.cs"},{"SourceFile":"UControl\\UCCarL.xaml.cs"},{"SourceFile":"UControl\\UCLMix.xaml.cs"},{"SourceFile":"UControl\\UCMix.xaml.cs"},{"SourceFile":"UControl\\UCMixR.xaml.cs"},{"SourceFile":"UControl\\UCPermissionList.xaml.cs"},{"SourceFile":"UControl\\UCPostionList.xaml.cs"},{"SourceFile":"UControl\\UCProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCRoleList.xaml.cs"},{"SourceFile":"UControl\\UCRProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCStorage.xaml.cs"},{"SourceFile":"UControl\\UCStorageNew.xaml.cs"},{"SourceFile":"UControl\\UCStorageNewx.xaml.cs"},{"SourceFile":"UControl\\UCTakeOff.xaml.cs"},{"SourceFile":"UControl\\UCUserList.xaml.cs"},{"SourceFile":"Views\\AddReportFrom.xaml.cs"},{"SourceFile":"Views\\CheckUserWin.xaml.cs"},{"SourceFile":"Views\\Classes.xaml.cs"},{"SourceFile":"Views\\DryingRoomUC.xaml.cs"},{"SourceFile":"Views\\HBLogWin.xaml.cs"},{"SourceFile":"Views\\ProductionData.xaml.cs"},{"SourceFile":"Views\\.xaml.cs"},{"SourceFile":"Views\\ReportForm.xaml.cs"},{"SourceFile":"Views\\ShouPeiWin.xaml.cs"},{"SourceFile":"Views\\SopInfoWin.xaml.cs"},{"SourceFile":"Views\\FlowInfoWin.xaml.cs"},{"SourceFile":"Views\\LanJu_Complete.xaml.cs"},{"SourceFile":"Views\\LanJu_DeviceItems.xaml.cs"},{"SourceFile":"Views\\LanJu_Flow.xaml.cs"},{"SourceFile":"Views\\LanJu_Index.xaml.cs"},{"SourceFile":"Views\\LanJu_InOut.xaml.cs"},{"SourceFile":"Views\\LanJu_Material.xaml.cs"},{"SourceFile":"Views\\LanJu_NowUser.xaml.cs"},{"SourceFile":"Views\\LanJu_Operator.xaml.cs"},{"SourceFile":"Views\\LanJu_Paused.xaml.cs"},{"SourceFile":"Views\\LanJu_Prepare.xaml.cs"},{"SourceFile":"Views\\LanJu_User.xaml.cs"},{"SourceFile":"Views\\LanJu_UserRecord.xaml.cs"},{"SourceFile":"Views\\ViewPlcInfoWin.xaml.cs"},{"SourceFile":"Views\\ViewLogWin.xaml.cs"},{"SourceFile":"Web References\\AutoUpdate\\Reference.cs"},{"SourceFile":"HFstatus.xaml.cs"},{"SourceFile":"App.xaml.cs"},{"SourceFile":"LoginPage.xaml.cs"},{"SourceFile":"MainWindow.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormBlankingBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormChargingBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormLocator.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormOutBoxBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\FormShowSelect.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\FormItem\\Main.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\LoginPageBak.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\LoginPage.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\MainWindow.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Tools\\ModuleUC.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\ordertj.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\orderzfzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\orderzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_order.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_ordertj.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_orderzfzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\product_orderzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCArea.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCCar.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCCarL.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCLMix.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCMix.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCMixR.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCPermissionList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCPostionList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCProgressBar.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCRoleList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCRProgressBar.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCStorage.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCStorageNew.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCStorageNewx.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCTakeOff.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\UControl\\UCUserList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\AddReportFrom.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\CheckUserWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\Classes.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\DryingRoomUC.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\HBLogWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ProductionData.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\FormClassesTime.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ReportForm.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ShouPeiWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\SopInfoWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\FlowInfoWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Complete.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_DeviceItems.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Flow.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Index.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_InOut.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Material.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_NowUser.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Operator.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Paused.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_Prepare.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_User.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\LanJu_UserRecord.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ViewPlcInfoWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\Views\\ViewLogWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\HFstatus.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\App.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\XGL_Content.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\obj\\x86\\Debug\\GeneratedInternalTypeHelper.g.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\HandyControls.3.4.5\\lib\\net48\\HandyControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\SharpZipLib.1.3.3\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\LiveCharts.0.9.7\\lib\\net40\\LiveCharts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\LoadingIndicators.WPF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MaterialDesignColors.2.1.4\\lib\\net462\\MaterialDesignColors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MaterialDesignThemes.4.9.0\\lib\\net462\\MaterialDesignThemes.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.39\\lib\\net45\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\PdfiumViewer.2.13.0.0\\lib\\net20\\PdfiumViewer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\PdfSharpCore.1.3.60\\lib\\netstandard2.0\\PdfSharpCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\SixLabors.Fonts.1.0.0\\lib\\netstandard2.0\\SixLabors.Fonts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\SixLabors.ImageSharp.1.0.4\\lib\\net472\\SixLabors.ImageSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Memory.4.5.4\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Runtime.CompilerServices.Unsafe.4.7.0\\lib\\netstandard2.0\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Speech.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\System.Windows.Interactivity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsFormsIntegration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\WpfCustomControlLibrary1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Aero.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Metro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.VS2010.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.DataGrid.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.Toolkit.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\ZCustomControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL\\bin\\Debug\\XGL.exe","OutputItemRelativePath":"XGL.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/XGLFinishPro/.vs/XGLFinishPro.csproj.dtbcache.json b/shangjian/XGLFinishPro/.vs/XGLFinishPro.csproj.dtbcache.json
index bf50e8c..4c30b58 100644
--- a/shangjian/XGLFinishPro/.vs/XGLFinishPro.csproj.dtbcache.json
+++ b/shangjian/XGLFinishPro/.vs/XGLFinishPro.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro","ProjectFileName":"XGLFinishPro.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"APP_Code\\AutoClosedMsgBox.cs"},{"SourceFile":"APP_Code\\BrushHelper.cs"},{"SourceFile":"APP_Code\\CarInfo.cs"},{"SourceFile":"APP_Code\\CommonHelper.cs"},{"SourceFile":"APP_Code\\DESProvider.cs"},{"SourceFile":"APP_Code\\ImageHelper.cs"},{"SourceFile":"APP_Code\\ImageSourceHelper.cs"},{"SourceFile":"APP_Code\\JsonHelper.cs"},{"SourceFile":"APP_Code\\snap7.net.cs"},{"SourceFile":"APP_Code\\StorageData.cs"},{"SourceFile":"APP_Code\\test.cs"},{"SourceFile":"FormItem\\FormBlankingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormBoard.xaml.cs"},{"SourceFile":"FormItem\\FormChargingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormLocator.xaml.cs"},{"SourceFile":"FormItem\\FormOutBoxBoard.xaml.cs"},{"SourceFile":"FormItem\\FormShowSelect.xaml.cs"},{"SourceFile":"FormItem\\Main.xaml.cs"},{"SourceFile":"snap7.net.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter1.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter.cs"},{"SourceFile":"Tools\\ModuleUC.xaml.cs"},{"SourceFile":"Tools\\BatchStatusValueConverter.cs"},{"SourceFile":"Tools\\NumericValidationRule.cs"},{"SourceFile":"Tools\\OrderInOutConverter.cs"},{"SourceFile":"Tools\\ParentOrderConverter.cs"},{"SourceFile":"Tools\\SerialHelper.cs"},{"SourceFile":"Tools\\ShiftConvert.cs"},{"SourceFile":"Tools\\SyncFlagColorConverter.cs"},{"SourceFile":"Tools\\NetStatusToColorConvert.cs"},{"SourceFile":"Tools\\MyValueConverter.cs"},{"SourceFile":"Tools\\DeviceNameConverter.cs"},{"SourceFile":"Tools\\SyncFlagConverter.cs"},{"SourceFile":"Tools\\UserDatePicker.cs"},{"SourceFile":"Tools\\ValidationHelper.cs"},{"SourceFile":"UControl\\ordertj.xaml.cs"},{"SourceFile":"UControl\\orderzfzy.xaml.cs"},{"SourceFile":"UControl\\orderzy.xaml.cs"},{"SourceFile":"UControl\\product_order.xaml.cs"},{"SourceFile":"UControl\\product_ordertj.xaml.cs"},{"SourceFile":"UControl\\product_orderzfzy.xaml.cs"},{"SourceFile":"UControl\\product_orderzy.xaml.cs"},{"SourceFile":"UControl\\UCArea.xaml.cs"},{"SourceFile":"UControl\\UCBoard.xaml.cs"},{"SourceFile":"UControl\\UCCar.xaml.cs"},{"SourceFile":"UControl\\UCCarL.xaml.cs"},{"SourceFile":"UControl\\UCLMix.xaml.cs"},{"SourceFile":"UControl\\UCMix.xaml.cs"},{"SourceFile":"UControl\\UCMixR.xaml.cs"},{"SourceFile":"UControl\\UCPermissionList.xaml.cs"},{"SourceFile":"UControl\\UCPostionList.xaml.cs"},{"SourceFile":"UControl\\UCProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCRoleList.xaml.cs"},{"SourceFile":"UControl\\UCRProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCStorage.xaml.cs"},{"SourceFile":"UControl\\UCStorageNew.xaml.cs"},{"SourceFile":"UControl\\UCStorageNewx.xaml.cs"},{"SourceFile":"UControl\\UCTakeOff.xaml.cs"},{"SourceFile":"UControl\\UCUserList.xaml.cs"},{"SourceFile":"Views\\AddReportFrom.xaml.cs"},{"SourceFile":"Views\\AuxiliaryPersonnel.xaml.cs"},{"SourceFile":"Views\\ExecReportWorkWin.xaml.cs"},{"SourceFile":"Views\\CheckUserWin.xaml.cs"},{"SourceFile":"Views\\DryingRoomUC.xaml.cs"},{"SourceFile":"Views\\firstInspection.xaml.cs"},{"SourceFile":"Views\\FirstInspectionReport.xaml.cs"},{"SourceFile":"Views\\HBLogWin.xaml.cs"},{"SourceFile":"Views\\LanJu_Check_Report.xaml.cs"},{"SourceFile":"Views\\LanJu_Conversion_Report.xaml.cs"},{"SourceFile":"Views\\LanJu_First_Inspection_Reprot.xaml.cs"},{"SourceFile":"Views\\OrderWorkIdSelect.xaml.cs"},{"SourceFile":"Views\\PieceSalaryCalWin.xaml.cs"},{"SourceFile":"Views\\punchCard.xaml.cs"},{"SourceFile":"Views\\QitaoLvUC.xaml.cs"},{"SourceFile":"Views\\ReportForm.xaml.cs"},{"SourceFile":"Views\\ReportPageSelect.xaml.cs"},{"SourceFile":"Views\\SelfInspectionForm.xaml.cs"},{"SourceFile":"Views\\ShouPeiWin.xaml.cs"},{"SourceFile":"Views\\SopInfoWin.xaml.cs"},{"SourceFile":"Views\\FlowInfoWin.xaml.cs"},{"SourceFile":"Views\\LanJu_Complete.xaml.cs"},{"SourceFile":"Views\\LanJu_DeviceItems.xaml.cs"},{"SourceFile":"Views\\LanJu_Flow.xaml.cs"},{"SourceFile":"Views\\LanJu_Index.xaml.cs"},{"SourceFile":"Views\\LanJu_InOut.xaml.cs"},{"SourceFile":"Views\\LanJu_Material.xaml.cs"},{"SourceFile":"Views\\LanJu_NowUser.xaml.cs"},{"SourceFile":"Views\\LanJu_Operator.xaml.cs"},{"SourceFile":"Views\\LanJu_Paused.xaml.cs"},{"SourceFile":"Views\\LanJu_Prepare.xaml.cs"},{"SourceFile":"Views\\LanJu_User.xaml.cs"},{"SourceFile":"Views\\LanJu_UserRecord.xaml.cs"},{"SourceFile":"Views\\ViewPlcInfoWin.xaml.cs"},{"SourceFile":"Views\\ViewLogWin.xaml.cs"},{"SourceFile":"Views\\weighWindows.xaml.cs"},{"SourceFile":"Web References\\AutoUpdate\\Reference.cs"},{"SourceFile":"App.xaml.cs"},{"SourceFile":"LoginPage.xaml.cs"},{"SourceFile":"MainWindow.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormBlankingBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormChargingBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormLocator.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormOutBoxBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormShowSelect.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\Main.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\LoginPage.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\MainWindow.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Tools\\ModuleUC.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\ordertj.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\orderzfzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\orderzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_order.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_ordertj.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_orderzfzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_orderzy.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCArea.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCBoard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCCar.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCCarL.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCLMix.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCMix.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCMixR.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCPermissionList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCPostionList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCProgressBar.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCRoleList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCRProgressBar.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCStorage.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCStorageNew.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCStorageNewx.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCTakeOff.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCUserList.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\AddReportFrom.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\AuxiliaryPersonnel.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ExecReportWorkWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\CheckUserWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\DryingRoomUC.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\firstInspection.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\FirstInspectionReport.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\HBLogWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Check_Report.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Conversion_Report.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_First_Inspection_Reprot.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\OrderWorkIdSelect.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\PieceSalaryCalWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\punchCard.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\QitaoLvUC.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ReportForm.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ReportPageSelect.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\SelfInspectionForm.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ShouPeiWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\SopInfoWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\FlowInfoWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Complete.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_DeviceItems.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Flow.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Index.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_InOut.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Material.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_NowUser.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Operator.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Paused.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Prepare.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_User.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_UserRecord.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ViewPlcInfoWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ViewLogWin.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\weighWindows.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\App.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\XGLFinishPro_Content.g.cs"},{"SourceFile":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\GeneratedInternalTypeHelper.g.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\AutoUpdate\\bin\\Debug\\AutoUpdate.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\HandyControls.3.4.5\\lib\\net48\\HandyControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\SharpZipLib.1.3.3\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\LiveCharts.0.9.7\\lib\\net40\\LiveCharts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\LoadingIndicators.WPF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MaterialDesignColors.2.1.4\\lib\\net462\\MaterialDesignColors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MaterialDesignThemes.4.9.0\\lib\\net462\\MaterialDesignThemes.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.39\\lib\\net45\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\PdfiumViewer.2.13.0.0\\lib\\net20\\PdfiumViewer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\PdfSharpCore.1.3.60\\lib\\netstandard2.0\\PdfSharpCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\SixLabors.Fonts.1.0.0\\lib\\netstandard2.0\\SixLabors.Fonts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\SixLabors.ImageSharp.1.0.4\\lib\\net472\\SixLabors.ImageSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Memory.4.5.4\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Runtime.CompilerServices.Unsafe.4.7.0\\lib\\netstandard2.0\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Speech.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\System.Windows.Interactivity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsFormsIntegration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\WpfCustomControlLibrary1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Aero.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Metro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.VS2010.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.DataGrid.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.Toolkit.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\Libs\\ZCustomControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\bin\\Debug\\XGLFinishPro.exe","OutputItemRelativePath":"XGLFinishPro.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGLFinishPro\\bin\\Debug\\XGLFinishPro.pdb","OutputItemRelativePath":"XGLFinishPro.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro","ProjectFileName":"XGLFinishPro.csproj","Configuration":"Debug|x86","FrameworkPath":"","Sources":[{"SourceFile":"APP_Code\\AutoClosedMsgBox.cs"},{"SourceFile":"APP_Code\\BrushHelper.cs"},{"SourceFile":"APP_Code\\CarInfo.cs"},{"SourceFile":"APP_Code\\CommonHelper.cs"},{"SourceFile":"APP_Code\\DESProvider.cs"},{"SourceFile":"APP_Code\\ImageHelper.cs"},{"SourceFile":"APP_Code\\ImageSourceHelper.cs"},{"SourceFile":"APP_Code\\JsonHelper.cs"},{"SourceFile":"APP_Code\\snap7.net.cs"},{"SourceFile":"APP_Code\\StorageData.cs"},{"SourceFile":"APP_Code\\test.cs"},{"SourceFile":"FormItem\\FormBlankingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormBoard.xaml.cs"},{"SourceFile":"FormItem\\FormChargingBoard.xaml.cs"},{"SourceFile":"FormItem\\FormLocator.xaml.cs"},{"SourceFile":"FormItem\\FormOutBoxBoard.xaml.cs"},{"SourceFile":"FormItem\\FormShowSelect.xaml.cs"},{"SourceFile":"FormItem\\Main.xaml.cs"},{"SourceFile":"ReprotPageSelect.cs"},{"SourceFile":"snap7.net.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter1.cs"},{"SourceFile":"Tools\\BtnBackGroundColorConverter.cs"},{"SourceFile":"Tools\\ModuleUC.xaml.cs"},{"SourceFile":"Tools\\BatchStatusValueConverter.cs"},{"SourceFile":"Tools\\NumericValidationRule.cs"},{"SourceFile":"Tools\\OrderInOutConverter.cs"},{"SourceFile":"Tools\\ParentOrderConverter.cs"},{"SourceFile":"Tools\\SerialHelper.cs"},{"SourceFile":"Tools\\ShiftConvert.cs"},{"SourceFile":"Tools\\SyncFlagColorConverter.cs"},{"SourceFile":"Tools\\NetStatusToColorConvert.cs"},{"SourceFile":"Tools\\MyValueConverter.cs"},{"SourceFile":"Tools\\DeviceNameConverter.cs"},{"SourceFile":"Tools\\SyncFlagConverter.cs"},{"SourceFile":"Tools\\UserDatePicker.cs"},{"SourceFile":"Tools\\ValidationHelper.cs"},{"SourceFile":"UControl\\ordertj.xaml.cs"},{"SourceFile":"UControl\\orderzfzy.xaml.cs"},{"SourceFile":"UControl\\orderzy.xaml.cs"},{"SourceFile":"UControl\\product_order.xaml.cs"},{"SourceFile":"UControl\\product_ordertj.xaml.cs"},{"SourceFile":"UControl\\product_orderzfzy.xaml.cs"},{"SourceFile":"UControl\\product_orderzy.xaml.cs"},{"SourceFile":"UControl\\UCArea.xaml.cs"},{"SourceFile":"UControl\\UCBoard.xaml.cs"},{"SourceFile":"UControl\\UCCar.xaml.cs"},{"SourceFile":"UControl\\UCCarL.xaml.cs"},{"SourceFile":"UControl\\UCLMix.xaml.cs"},{"SourceFile":"UControl\\UCMix.xaml.cs"},{"SourceFile":"UControl\\UCMixR.xaml.cs"},{"SourceFile":"UControl\\UCPermissionList.xaml.cs"},{"SourceFile":"UControl\\UCPostionList.xaml.cs"},{"SourceFile":"UControl\\UCProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCRoleList.xaml.cs"},{"SourceFile":"UControl\\UCRProgressBar.xaml.cs"},{"SourceFile":"UControl\\UCStorage.xaml.cs"},{"SourceFile":"UControl\\UCStorageNew.xaml.cs"},{"SourceFile":"UControl\\UCStorageNewx.xaml.cs"},{"SourceFile":"UControl\\UCTakeOff.xaml.cs"},{"SourceFile":"UControl\\UCUserList.xaml.cs"},{"SourceFile":"Views\\AddReportFrom.xaml.cs"},{"SourceFile":"Views\\AuxiliaryPersonnel.xaml.cs"},{"SourceFile":"Views\\ExecReportWorkWin.xaml.cs"},{"SourceFile":"Views\\CheckUserWin.xaml.cs"},{"SourceFile":"Views\\DryingRoomUC.xaml.cs"},{"SourceFile":"Views\\FinishedProduction.xaml.cs"},{"SourceFile":"Views\\firstInspection.xaml.cs"},{"SourceFile":"Views\\FirstInspectionReport.xaml.cs"},{"SourceFile":"Views\\HBLogWin.xaml.cs"},{"SourceFile":"Views\\LanJu_Check_Report.xaml.cs"},{"SourceFile":"Views\\LanJu_Conversion_Report.xaml.cs"},{"SourceFile":"Views\\LanJu_First_Inspection_Reprot.xaml.cs"},{"SourceFile":"Views\\OrderWorkIdSelect.xaml.cs"},{"SourceFile":"Views\\PersonView.xaml.cs"},{"SourceFile":"Views\\PieceSalaryCalWin.xaml.cs"},{"SourceFile":"Views\\punchCard.xaml.cs"},{"SourceFile":"Views\\QitaoLvUC.xaml.cs"},{"SourceFile":"Views\\ReportForm.xaml.cs"},{"SourceFile":"Views\\ReportPageSelect.xaml.cs"},{"SourceFile":"Views\\SelfInspectionForm.xaml.cs"},{"SourceFile":"Views\\ShouPeiWin.xaml.cs"},{"SourceFile":"Views\\SopInfoWin.xaml.cs"},{"SourceFile":"Views\\FlowInfoWin.xaml.cs"},{"SourceFile":"Views\\LanJu_Complete.xaml.cs"},{"SourceFile":"Views\\LanJu_DeviceItems.xaml.cs"},{"SourceFile":"Views\\LanJu_Flow.xaml.cs"},{"SourceFile":"Views\\LanJu_Index.xaml.cs"},{"SourceFile":"Views\\LanJu_InOut.xaml.cs"},{"SourceFile":"Views\\LanJu_Material.xaml.cs"},{"SourceFile":"Views\\LanJu_NowUser.xaml.cs"},{"SourceFile":"Views\\LanJu_Operator.xaml.cs"},{"SourceFile":"Views\\LanJu_Paused.xaml.cs"},{"SourceFile":"Views\\LanJu_Prepare.xaml.cs"},{"SourceFile":"Views\\LanJu_User.xaml.cs"},{"SourceFile":"Views\\LanJu_UserRecord.xaml.cs"},{"SourceFile":"Views\\ViewPlcInfoWin.xaml.cs"},{"SourceFile":"Views\\ViewLogWin.xaml.cs"},{"SourceFile":"Views\\weighWindows.xaml.cs"},{"SourceFile":"Web References\\AutoUpdate\\Reference.cs"},{"SourceFile":"App.xaml.cs"},{"SourceFile":"LoginPage.xaml.cs"},{"SourceFile":"MainWindow.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormBlankingBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormChargingBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormLocator.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormOutBoxBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\FormShowSelect.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\FormItem\\Main.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\LoginPage.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\MainWindow.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Tools\\ModuleUC.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\ordertj.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\orderzfzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\orderzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_order.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_ordertj.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_orderzfzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\product_orderzy.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCArea.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCBoard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCCar.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCCarL.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCLMix.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCMix.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCMixR.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCPermissionList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCPostionList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCProgressBar.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCRoleList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCRProgressBar.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCStorage.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCStorageNew.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCStorageNewx.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCTakeOff.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\UControl\\UCUserList.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\AddReportFrom.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\AuxiliaryPersonnel.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ExecReportWorkWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\CheckUserWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\DryingRoomUC.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\FinishedProduction.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\firstInspection.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\FirstInspectionReport.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\HBLogWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Check_Report.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Conversion_Report.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_First_Inspection_Reprot.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\OrderWorkIdSelect.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\PersonView.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\PieceSalaryCalWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\punchCard.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\QitaoLvUC.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ReportForm.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ReportPageSelect.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\SelfInspectionForm.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ShouPeiWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\SopInfoWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\FlowInfoWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Complete.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_DeviceItems.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Flow.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Index.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_InOut.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Material.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_NowUser.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Operator.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Paused.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_Prepare.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_User.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\LanJu_UserRecord.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ViewPlcInfoWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\ViewLogWin.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\Views\\weighWindows.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\App.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\XGLFinishPro_Content.g.cs"},{"SourceFile":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\obj\\x86\\Debug\\GeneratedInternalTypeHelper.g.cs"}],"References":[{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\AutoUpdate\\bin\\Debug\\AutoUpdate.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\AutoUpdate\\bin\\Debug\\AutoUpdate.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CentralControl\\bin\\x86\\Debug\\CentralControl.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Google.Protobuf.3.5.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\HandyControls.3.4.5\\lib\\net48\\HandyControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\SharpZipLib.1.3.3\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\LanJu\\bin\\Debug\\LanJu.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\LiveCharts.0.9.7\\lib\\net40\\LiveCharts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\LoadingIndicators.WPF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MaterialDesignColors.2.1.4\\lib\\net462\\MaterialDesignColors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MaterialDesignThemes.4.9.0\\lib\\net462\\MaterialDesignThemes.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.39\\lib\\net45\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\MySql.Data.6.8.8\\lib\\net40\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\PdfiumViewer.2.13.0.0\\lib\\net20\\PdfiumViewer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\PdfSharpCore.1.3.60\\lib\\netstandard2.0\\PdfSharpCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\S7netplus.0.20.0\\lib\\net462\\S7.Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\SixLabors.Fonts.1.0.0\\lib\\netstandard2.0\\SixLabors.Fonts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\SixLabors.ImageSharp.1.0.4\\lib\\net472\\SixLabors.ImageSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Facades\\System.ComponentModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.Install.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\System.Runtime.CompilerServices.Unsafe.4.7.0\\lib\\netstandard2.0\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Speech.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\System.Windows.Interactivity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsFormsIntegration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\WpfCustomControlLibrary1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Aero.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.Metro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.AvalonDock.Themes.VS2010.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.DataGrid.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\packages\\Extended.Wpf.Toolkit.3.3.0\\lib\\net40\\Xceed.Wpf.Toolkit.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Data\\bin\\x86\\Debug\\XGL.Data.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Model\\bin\\x86\\Debug\\XGL.Models.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll"},{"Reference":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\Libs\\ZCustomControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\working_area\\project\\榄菊上位机\\lanju-client\\shangjian\\XGLFinishPro\\bin\\Debug\\XGLFinishPro.exe","OutputItemRelativePath":"XGLFinishPro.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml b/shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml
new file mode 100644
index 0000000..7a653a2
--- /dev/null
+++ b/shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml
@@ -0,0 +1,230 @@
+<Window x:Class="XGLFinishPro.Views.Lanju_Daily_Check_Report"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:XGLFinishPro.Views"
+      mc:Ignorable="d"
+      WindowState="Maximized"
+      WindowStyle="None"
+      Loaded="Window_Loaded"
+      Height="1000" Width="1900">
+    <!--Loaded="Window_Loaded"-->
+    <Window.Resources>
+        <ResourceDictionary>
+            <Style BasedOn="{x:Null}" TargetType="ComboBox">
+                <Setter Property="Width" Value="50" />
+                <Setter Property="Height" Value="30" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="FontSize" Value="20" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ComboBox">
+                            <Grid x:Name="TogGrid">
+                                <ToggleButton
+                                 x:Name="ToggleButton"
+                                 Width="{TemplateBinding Width}"
+                                 Height="{TemplateBinding Height}"
+                                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                 HorizontalContentAlignment="Center"
+                                 VerticalContentAlignment="Center"
+                                 Background="{TemplateBinding Background}"
+                                 BorderBrush="{TemplateBinding BorderBrush}"
+                                 BorderThickness="{TemplateBinding BorderThickness}"
+                                 Click="ToggleButton_Click"
+                                 ClickMode="Press"
+                                 Focusable="false"
+                                 FontSize="{TemplateBinding FontSize}">
+                                    <ContentPresenter
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center"
+                                     Content="{TemplateBinding SelectionBoxItem}"
+                                     ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                     ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </ToggleButton>
+                                <Popup
+                                 x:Name="Popup"
+                                 AllowsTransparency="True"
+                                 Focusable="False"
+                                 IsOpen="{TemplateBinding IsDropDownOpen}"
+                                 Placement="Bottom"
+                                 PopupAnimation="Slide">
+                                    <Grid
+                                     x:Name="DropDown"
+                                     MinWidth="{TemplateBinding ActualWidth}"
+                                     MaxHeight="200"
+                                     SnapsToDevicePixels="True">
+                                        <Border
+                                         x:Name="DropDownBorder"
+                                         Background="White"
+                                         BorderBrush="Gray"
+                                         BorderThickness="1" />
+                                        <ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
+                                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
+                                        </ScrollViewer>
+                                    </Grid>
+                                </Popup>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsFocused" Value="true">
+                                    <Setter TargetName="ToggleButton" Property="Background" Value="Gray" />
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="ToggleButton" Property="Background" Value="Gray" />
+                                </Trigger>
+                                <Trigger Property="HasItems" Value="false">
+                                    <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="false">
+                                    <Setter Property="Foreground" Value="Gray" />
+                                </Trigger>
+                                <Trigger Property="IsGrouping" Value="true">
+                                    <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                                </Trigger>
+                                <!--  新增的Trigger，用于在选择完成后将按钮颜色变回原来的颜色  -->
+                                <Trigger Property="IsDropDownOpen" Value="false">
+                                    <Setter TargetName="ToggleButton" Property="Background" Value="White" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="TextBlockStyle" TargetType="TextBlock">
+                <Setter Property="FontSize" Value="25" />
+                <Setter Property="Margin" Value="10,0,8,0" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="CheckBoxStyle" TargetType="{x:Type CheckBox}">
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="LayoutTransform">
+                    <Setter.Value>
+                        <ScaleTransform ScaleX="1.5" ScaleY="1.5" />
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </ResourceDictionary>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Label
+             Grid.RowSpan="2"
+             Grid.Column="1"
+             HorizontalAlignment="Center"
+             VerticalAlignment="Center"
+             Content="班组安全生产每日点检报表"
+             FontSize="40"
+             FontWeight="Bold" />
+            <StackPanel
+             Grid.Column="2"
+             HorizontalAlignment="Center"
+             VerticalAlignment="Center"
+             Orientation="Horizontal">
+                
+                <Button
+                 x:Name="IsFinalSubmit"
+                 Width="100"
+                 Height="50"
+                 Margin="10"
+                 Background="Red"
+                 Click="Submit_Click"
+                 Content="最终提交"
+                 FontSize="20"
+                 Foreground="White" />
+
+                <Button
+                 x:Name="Commit"
+                 Width="100"
+                 Height="50"
+                 Margin="10"
+                 Background="#2B7EE6"
+                 Click="Submit_Click"
+                 Content="提交"
+                 FontSize="20"
+                 Foreground="White" />
+
+                <Button
+                 Width="100"
+                 Height="50"
+                 Margin="10"
+                 Background="#2B7EE6"
+                 Click="Close_Click"
+                 Content="关闭"
+                 FontSize="20"
+                 Foreground="White" />
+            </StackPanel>
+            <!--<StackPanel
+             Grid.Row="2"
+             Grid.Column="2"
+             HorizontalAlignment="Right"
+             VerticalAlignment="Bottom"
+             Orientation="Horizontal">
+                <Label Content="表单编号:" FontSize="25" />
+                <Label
+                 x:Name="OrderCode"
+                 Content="08GL05C001-014A"
+                 FontSize="25" />
+            </StackPanel>-->
+        </Grid>
+        <Grid
+         x:Name="MainGrid"
+         Grid.Row="1"
+         Margin="10,10,10,0" />
+        <StackPanel
+         Grid.Row="2"
+         Margin="10,10,10,0"
+         Orientation="Horizontal">
+            <StackPanel Orientation="Vertical">
+                <TextBlock
+                 HorizontalAlignment="Left"
+                 Style="{StaticResource TextBlockStyle}"
+                 Text="填写要求" />
+                <TextBlock
+                 HorizontalAlignment="Left"
+                 Style="{StaticResource TextBlockStyle}"
+                 Text="2.在“口”中勾选类别。" />
+                <TextBlock
+                 HorizontalAlignment="Left"
+                 Style="{StaticResource TextBlockStyle}"
+                 Text="3.“检查结果”，是填“√”，否填“x”,若有异常则填写实际情况。" />
+            </StackPanel>
+            <!--<StackPanel
+             Width="500"
+             Margin="600,0,0,20"
+             HorizontalAlignment="Right"
+             VerticalAlignment="Bottom"
+             Orientation="Horizontal">
+                <TextBlock
+                 HorizontalAlignment="Right"
+                 Style="{StaticResource TextBlockStyle}"
+                 Text="班组长签字：" />
+                <TextBlock
+                 x:Name="NickName"
+                 HorizontalAlignment="Right"
+                 Style="{StaticResource TextBlockStyle}"
+                 Text="" />
+            </StackPanel>-->
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml.cs b/shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml.cs
new file mode 100644
index 0000000..39336f3
--- /dev/null
+++ b/shangjian/XGLFinishPro/Views/Lanju_Daily_Check_Report.xaml.cs
@@ -0,0 +1,960 @@
+using CentralControl.App_Code;
+using CommonFunc;
+using CommonFunc.Tools;
+using HandyControl.Tools.Extension;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using XGL.Data.DBService;
+using XGL.Models;
+
+namespace XGLFinishPro.Views
+{
+    public partial class Lanju_Daily_Check_Report : Window
+    {
+        private string belong_to = string.Empty;
+        private List<MesTableSelfDetialModel> data;
+        FormingMachineService dbService = new FormingMachineService();
+        private static double LineWidth = 30;
+        private static double LineHeight = 30;
+        private static double MainLineWidth = 150;
+        private static double MainLineHeight = 50;
+        string deviceCode = Utils.GetAppSetting("DeviceCode");
+        string productName = string.Empty;
+        private string shiftCode = "";
+        private string shiftName = "";
+        private string product_code = string.Empty;
+        private readonly List<string> _hours = new List<string>() { "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23" };
+        private bool isUpdate = false;
+        private readonly List<string> _minutes = new List<string> { "00", "05", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55" };
+        private string LineStr = "";
+        private readonly List<string> teamGroup = new List<string>() { "白班", "中班", "晚班"};
+        public Lanju_Daily_Check_Report()
+        {
+            InitializeComponent();
+            this.date = LoginUser.WorkDate;
+            shiftCode = LoginUser.ShiftCode;
+            shiftName = dbService.GetShiftById(shiftCode);
+        }
+        private List<ConveterData> list = new List<ConveterData>();
+        private string date;
+        private MesTableSelf mesTableSelf;
+        private List<MesTableSelfDetialModel> mesTableSelfDetialList;
+
+        public List<BaseDictData> DictDatas { get; private set; }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            //this.NickName.Text = LoginUser.UserName;
+            LineStr = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode"));
+            LoadData();
+        }
+
+        private void LoadData(bool addLine = false)
+        {
+            isUpdate = true;
+            list.Clear();
+            this.MainGrid.Children.Clear();
+            this.MainGrid.RowDefinitions.Clear();
+            this.MainGrid.ColumnDefinitions.Clear();
+            DictDatas = dbService.GetConversionReportType();
+
+            var baseDictDatas = dbService.GetSelfCheckInfo("secutity_production").ToList();
+            var baseMainDictDatas = dbService.GetSelfCheckInfo("secutity_production_result").ToList();
+            Dictionary<string, List<string>> mainDict = new Dictionary<string, List<string>>();
+            for (int i = 0; i < baseDictDatas.Count; i++)
+            {
+                mainDict.Add(baseDictDatas[i].dict_label, baseMainDictDatas.Where(t => t.remark == baseDictDatas[i].remark || string.IsNullOrEmpty(t.remark)).Select(t => t.dict_value).ToList());
+                if (!list.Any(t => t.label == baseDictDatas[i].dict_label))
+                {
+                    list.Add(new ConveterData()
+                    {
+                        label = baseDictDatas[i].dict_label,
+                        value = MD5Provider.Hash(baseDictDatas[i].dict_label),
+                    });
+                }
+            }
+            list.ForEach(t => t.value = t.value.Insert(0, "A"));//开头插入"A"
+            mesTableSelf = dbService.GetMesTableSelf(deviceCode, null, date, "SecurityProduction"+ shiftName);
+            if (mesTableSelf == null)
+            {
+                mesTableSelf = new MesTableSelf()
+                {
+                    id = Guid.NewGuid().ToString(),
+                    line_code = deviceCode,
+                    check_date = date,
+                    product_code = product_code,
+                    factory_code = Utils.GetAppSetting("SiteCode"),
+                    del_flag = "0",
+                    product_date = date,
+                    bz = string.Empty,
+                    report_name = "SecurityProduction" + shiftName
+                };
+                dbService.InsertMesTableSelf(mesTableSelf);
+            }
+            belong_to = mesTableSelf.id;
+            // 获取当天该班次的记录
+            data = dbService.GetMesTableSelfDetialByShiftCode(mesTableSelf.id, shiftCode, baseDictDatas.Count);
+            if (data.Count == 0) // 如果不存在记录，创建新记录
+            {
+                data = new List<MesTableSelfDetialModel>();
+                foreach (var item in baseDictDatas)
+                {
+                    var newModel = new MesTableSelfDetialModel
+                    {
+                        id = Guid.NewGuid().ToString(),
+                        belong_to = mesTableSelf.id,
+                        info_name = item.dict_label,
+                        info_code = item.dict_code,
+                        check_result = "",  // 初始化为空字符串
+                        bz = "",           // 初始化为空字符串
+                        remark = shiftCode,
+                        table_line = 1,    // 设置默认值
+                        index = 0,         // 设置默认值
+                        del_flag = "0"     // 设置为未删除
+                    };
+                    
+                    // 插入新记录到数据库
+                    dbService.InsertMesTableSelfDetial(newModel);
+                    
+                    // 添加到内存中的列表
+                    data.Add(newModel);
+                }
+            }
+            if (addLine)
+            {
+                int maxLine = data.Max(t => t.table_line) + 1;
+                data.ForEach(t => { t.index++; });
+                data.Insert(0, new MesTableSelfDetialModel() { index = 0 });
+                data.RemoveAll(t => t.index == 7);
+            }
+            //for (var i = 0; i < 1; i++)
+            //{
+
+            //}
+            foreach (var item in baseDictDatas)
+            {
+                bool hasData = data.Where(t => t.info_name == item.dict_label && t.remark == shiftCode).Any();
+                if (!hasData)
+                {
+                    int tableLine = 1;
+                    MesTableSelfDetialModel mesTableSelfDetialModel = data.Where(t => t.table_line != 0).FirstOrDefault();
+                    if (mesTableSelfDetialModel != null)
+                    {
+                        tableLine = mesTableSelfDetialModel.table_line;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            tableLine = data.Max(t => t.table_line) + 1;
+                        }
+                        catch
+                        {
+
+                        }
+                    }
+                    data.Add(new MesTableSelfDetialModel()
+                    {
+                        table_line = tableLine,
+                        info_name = item.dict_label,
+                        remark = shiftCode,
+                        info_code = DictDatas.FirstOrDefault(t => t.dict_label == item.dict_label)?.dict_code,
+                    });
+                }
+            }
+            Dictionary<string, Dictionary<int, MesTableSelfDetialModel>> dic = new Dictionary<string, Dictionary<int, MesTableSelfDetialModel>>();
+            foreach (var item in data)
+            {
+                if (item.info_name == null || dic.Keys.Contains(item.info_name))
+                {
+                    continue;
+                }
+                var mesTableSelfDetialModels = data.Where(t => t.info_name == item.info_name).ToList();
+                
+                // 使用GroupBy和ToDictionary来处理可能的重复index
+                var dictionary = mesTableSelfDetialModels
+                    .GroupBy(t => t.index)
+                    .ToDictionary(
+                        g => g.Key, 
+                        g => g.First()  // 如果有重复的index，取第一个记录
+                    );
+                
+                dic.Add(item.info_name, dictionary);
+                
+                if (!list.Any(t => t.label == item.info_name))
+                {
+                    list.Add(new ConveterData()
+                    {
+                        label = item.info_name,
+                        value = MD5Provider.Hash(item.info_name),
+                    });
+                }
+            }
+            list.ForEach(t => t.value = t.value.Insert(0, "A"));
+            MakeHeaderData();
+            MakeMainData(baseDictDatas, mainDict, dic);
+            UpdateUI();
+            isUpdate = false;
+        }
+
+        private void UpdateUI()
+        {
+            try
+            {
+                double width = this.MainGrid.GetValidWidth();
+                double widthCount = this.MainGrid.ColumnDefinitions.Count;
+                var lineWidth = width / (widthCount + 3.2);
+                double height = this.MainGrid.GetValidHeight();
+                double heightCount = this.MainGrid.RowDefinitions.Count;
+                var lineHeight = height / heightCount;
+                foreach (var item in this.MainGrid.Children)
+                {
+                    if (item is ComboBox comboBox)
+                    {
+                        comboBox.Width = lineWidth;
+                        comboBox.Height = lineHeight - 10;
+                        comboBox.IsEnabled = !mesTableSelf.IsFinal;
+                    }
+
+                    if (item is TextBox textBox)
+                    {
+                        textBox.Width = Width = (this.MainGrid.GetValidWidth()) /
+                            (this.MainGrid.ColumnDefinitions.Count + 3.2) * 5 - 10;
+                        textBox.Height = this.MainGrid.GetValidHeight() / MainGrid.RowDefinitions.Count - 5;
+                        textBox.IsEnabled = !mesTableSelf.IsFinal;
+                    }
+                }
+                this.Commit.Visibility = mesTableSelf.IsFinal ? Visibility.Collapsed : Visibility.Visible;
+                this.IsFinalSubmit.Visibility = this.Commit.Visibility;
+            }
+            catch
+            {
+
+            }
+        }
+
+        private void MakeMainData(List<BaseDictData> baseDictDatas, Dictionary<string, List<string>> mainDict, Dictionary<string, Dictionary<int, MesTableSelfDetialModel>> dic)
+        {
+            string name = baseDictDatas.FirstOrDefault()?.remark;
+            for (int i = 0; i < baseDictDatas.Count; i++)
+            {
+                this.MainGrid.RowDefinitions.Add(new RowDefinition()
+                {
+                    Height = new GridLength(1.0, GridUnitType.Star)
+                });
+            }
+            for (int i = 3; i < baseDictDatas.Count + 3; i++)
+            {
+                Line line;
+                if (i == baseDictDatas.Count + 2)
+                {
+                    line = new Line()
+                    {
+                        VerticalAlignment = VerticalAlignment.Bottom,
+                        X1 = 1,
+                        Stretch = Stretch.Fill,
+                        StrokeThickness = 1,
+                        Stroke = Brushes.Black,
+                    };
+                    Grid.SetColumn(line, 0);
+                    Grid.SetRow(line, i);
+                    Grid.SetColumnSpan(line, 99);
+                    this.MainGrid.Children.Add(line);
+                    continue;
+                }
+                line = new Line()
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    X1 = 1,
+                    Stretch = Stretch.Fill,
+                    StrokeThickness = 1,
+                    Stroke = Brushes.Black,
+                };
+                Grid.SetColumn(line, 0);
+                Grid.SetRow(line, i);
+                Grid.SetColumnSpan(line, 1);
+                this.MainGrid.Children.Add(line);
+                line = new Line()
+                {
+                    VerticalAlignment = VerticalAlignment.Bottom,
+                    X1 = 1,
+                    Stretch = Stretch.Fill,
+                    StrokeThickness = 1,
+                    Stroke = Brushes.Black,
+                };
+                Grid.SetColumn(line, 2);
+                Grid.SetRow(line, i);
+                Grid.SetColumnSpan(line, 99);
+                this.MainGrid.Children.Add(line);
+                if (name != baseDictDatas[i - 3].remark)
+                {
+                    line = new Line()
+                    {
+                        VerticalAlignment = VerticalAlignment.Top,
+                        X1 = 1,
+                        Stretch = Stretch.Fill,
+                        StrokeThickness = 1,
+                        Stroke = Brushes.Black,
+                    };
+                    Grid.SetColumn(line, 1);
+                    Grid.SetRow(line, i);
+                    Grid.SetColumnSpan(line, 1);
+                    this.MainGrid.Children.Add(line);
+                }
+                name = baseDictDatas[i - 3].remark;
+            }
+            for (int i = 0; i < baseDictDatas.Count; i++)
+            {
+                if (name != baseDictDatas[i].remark)
+                {
+                    TextBlock textBlock2 = new TextBlock()
+                    {
+                        Text = baseDictDatas[i].remark,
+                        FontSize = 18,
+                        FontWeight = FontWeights.Bold,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                    };
+                    Grid.SetColumn(textBlock2, 1);
+                    Grid.SetRow(textBlock2, i + 3);
+                    Grid.SetRowSpan(textBlock2, baseDictDatas.Where(t => t.remark == baseDictDatas[i].remark).Count());
+                    this.MainGrid.Children.Add(textBlock2);
+                }
+                name = baseDictDatas[i].remark;
+                TextBlock textBlock = new TextBlock()
+                {
+                    Text = i + 1 + "",
+                    VerticalAlignment = VerticalAlignment.Center,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    FontSize = 18,
+                    FontWeight = FontWeights.Bold,
+                };
+                Grid.SetColumn(textBlock, 0);
+                Grid.SetRow(textBlock, i + 3);
+                this.MainGrid.Children.Add(textBlock);
+
+                textBlock = new TextBlock()
+                {
+                    Text = baseDictDatas[i].dict_label.Replace("___", "/"),
+                    VerticalAlignment = VerticalAlignment.Center,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    FontSize = 18,
+                    FontWeight = FontWeights.Bold,
+                    TextWrapping = TextWrapping.Wrap,
+                };
+                Grid.SetColumn(textBlock, 2);
+                Grid.SetRow(textBlock, i + 3);
+                this.MainGrid.Children.Add(textBlock);
+            }
+
+            int index = 1;
+            //检查结果下拉框
+            for (int i = 0; i < baseDictDatas.Count; i++)
+            {
+                index = 1;
+                for (int j = 0; j < 1; j++) // 只保留一列检查结果
+                {
+                    int column = 3 + (j * 2);
+                    ComboBox comboBox = new ComboBox()
+                    {
+                        Name = list.First(t => t.label == baseDictDatas[i].dict_label).value + index,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        ItemsSource = mainDict[baseDictDatas[i].dict_label]?.Distinct(),
+                        SelectedItem = data.Where(t => t.info_name == baseDictDatas[i].dict_label && t.index == j).Select(t => t.check_result).FirstOrDefault(),
+                        Width = 50 // 设置宽度为100，可以根据需要调整
+                    };
+                    comboBox.SelectionChanged += SelectionChanged;
+                    Grid.SetRow(comboBox, i + 3);
+                    Grid.SetColumn(comboBox, column);
+                    Grid.SetColumnSpan(comboBox, 2);
+                    this.MainGrid.Children.Add(comboBox);
+                    index++;
+                }
+            }
+            //存在问题输入文本框
+            for (int i = 0; i < baseDictDatas.Count; i++)
+            {
+                index = 1;
+                for (int j = 0; j < 1; j++) // 只保留一列检查结果
+                {
+                    int column = 5 + (j * 2);
+                    TextBox textBox = new TextBox()
+                    {
+                        Name = list.First(t => t.label == baseDictDatas[i].dict_label).value + index,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        //Width = (this.MainGrid.GetValidWidth())/(this.MainGrid.ColumnDefinitions.Count + 3.2)*5-10,
+                        //Height = this.MainGrid.GetValidHeight()/ MainGrid.RowDefinitions.Count-5,
+                        FontSize = 18,
+                        Text = data.Where(t => t.info_name == baseDictDatas[i].dict_label && t.index == j)
+                               .Select(t => t.bz)
+                               .FirstOrDefault() // 显示已有的BZ值
+                    };
+                    textBox.TextChanged += TextBox_TextChanged;
+                    Grid.SetRow(textBox, i + 3);
+                    Grid.SetColumn(textBox, column);
+                    Grid.SetColumnSpan(textBox, 6);
+                    this.MainGrid.Children.Add(textBox);
+                    index++;
+                }
+            }
+            // 添加三列空白列
+            for (int i = 0; i < baseDictDatas.Count; i++)
+            {
+                for (int j = 0; j < 3; j++)
+                {
+                    int column = 5 + (j * 2);
+                    TextBlock emptyBlock = new TextBlock()
+                    {
+                        Text = "",
+                        VerticalAlignment = VerticalAlignment.Center,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                    };
+                    Grid.SetRow(emptyBlock, i + 3);
+                    Grid.SetColumn(emptyBlock, column);
+                    Grid.SetColumnSpan(emptyBlock, 2);
+                    this.MainGrid.Children.Add(emptyBlock);
+                }
+            }
+        }
+
+        private void SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (isUpdate)
+            {
+                return;
+            }
+            if (sender is ComboBox comboBox)
+            {
+                if (comboBox.Name.Contains("班组"))
+                {
+                    var index = int.Parse(comboBox.Name.Substring(comboBox.Name.Length - 1, 1));
+                    data.Where(t => t.index == index - 1).ForEach(t => t.remark = shiftCode.ToString());
+                }
+                else
+                {
+                    var key = list.First(t => t.value == comboBox.Name.Substring(0, comboBox.Name.Length - 1)).label;
+                    var index = int.Parse(comboBox.Name.Substring(comboBox.Name.Length - 1, 1));
+                    MesTableSelfDetialModel mesTableSelfDetialModel = data.Where(t => t.info_name == key && t.index == index - 1).First();
+                    mesTableSelfDetialModel.check_result = comboBox.SelectedItem.ToString();
+                    if (string.IsNullOrEmpty(mesTableSelfDetialModel.id))
+                    {
+                        mesTableSelfDetialModel.id = Guid.NewGuid().ToString();
+                        mesTableSelfDetialModel.belong_to = belong_to;
+                    }
+                    foreach (var item in this.MainGrid.Children)
+                    {
+                        if (item is StackPanel stackPanel)
+                        {
+                            foreach (var item2 in stackPanel.Children)
+                            {
+                                if (item2 is ComboBox comboBox1)
+                                {
+                                    if (comboBox1.Name == $"班组{index}")
+                                    {
+                                        data.Where(t => t.index == index - 1).ForEach(t => t.remark = comboBox1.SelectedItem?.ToString());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (isUpdate)
+            {
+                return;
+            }
+            if (sender is TextBox textBox)
+            {
+                var key = list.First(t => t.value == textBox.Name.Substring(0, textBox.Name.Length - 1)).label;
+                var index = int.Parse(textBox.Name.Substring(textBox.Name.Length - 1, 1));
+                MesTableSelfDetialModel mesTableSelfDetialModel = data.Where(t => t.info_name == key && t.index == index - 1).First();
+                mesTableSelfDetialModel.bz = textBox.Text;
+                
+                if (string.IsNullOrEmpty(mesTableSelfDetialModel.id))
+                {
+                    mesTableSelfDetialModel.id = Guid.NewGuid().ToString();
+                    mesTableSelfDetialModel.belong_to = belong_to;
+                }
+            }
+        }
+
+        private void MakeHeaderData()
+        {
+            #region 画线
+            for (int i = 0; i < 11; i++)
+            {
+                double width = 1.0;
+                if (i == 0)
+                {
+                    width = 1.2;
+                }
+                if (i == 1)
+                {
+                    width = 2.0;
+                }
+                if (i == 2)
+                {
+                    width = 6.0;
+                }
+                if (i == 3)
+                {
+                    width = 1.0;
+                }
+                if (i == 4)
+                {
+                    width = 1.0;
+                }
+                this.MainGrid.ColumnDefinitions.Add(new ColumnDefinition()
+                {
+                    Width = new GridLength(width, GridUnitType.Star)
+                });
+            }
+
+            #region 画表格竖线
+
+            for (int i = 0; i < 11; i++)
+            {
+                // ✅ 跳过第3行（索引2）第6~11列（索引6~11）之间的竖线
+                if ((i < 4 || i % 2 == 1) && !(i >= 6 && i <= 11))
+                {
+                    Line line = new Line()
+                    {
+                        Name = $"YLine{i}",
+                        Stroke = Brushes.Black,
+                        StrokeThickness = 1,
+                        Y1 = 1,
+                        Stretch = Stretch.Fill,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                    };
+                    Grid.SetColumn(line, i);
+                    Grid.SetRow(line, 0);
+
+                    if (i >= 4 && i % 2 == 0)
+                    {
+                        Grid.SetRowSpan(line, 1);
+                    }
+                    else
+                    {
+                        Grid.SetRowSpan(line, 99);
+                    }
+                    this.MainGrid.Children.Add(line);
+                }
+            }
+
+            // 添加最后一列右边的边界线
+            Line boundaryLine = new Line()
+            {
+                Name = "BoundaryLine",
+                Stroke = Brushes.Black,
+                StrokeThickness = 1,
+                Y1 = 1,
+                Stretch = Stretch.Fill,
+                HorizontalAlignment = HorizontalAlignment.Right, // 让它靠右对齐
+            };
+
+            // 设置它在第 11 列（超出当前最大列）
+            Grid.SetColumn(boundaryLine, 11);
+            Grid.SetRow(boundaryLine, 0);
+            Grid.SetRowSpan(boundaryLine, 99); // 让它跨 99 行，确保足够高
+            this.MainGrid.Children.Add(boundaryLine);
+
+            #endregion
+
+            #region 画表格横线
+
+            for (int i = 0; i <= 2; i++)
+            {
+                this.MainGrid.RowDefinitions.Add(new RowDefinition()
+                {
+                    Height = new GridLength(1, GridUnitType.Star)
+                });
+
+                // 跳过第 1 行，不画线
+                if (i == 1)
+                    continue;
+
+                Line line = new Line()
+                {
+                    Name = $"XLine{i}",
+                    Stroke = Brushes.Black,
+                    StrokeThickness = 1,
+                    X1 = 1,
+                    Stretch = Stretch.Fill,
+                    VerticalAlignment = VerticalAlignment.Top,
+                };
+
+                Grid.SetColumn(line, 0);
+                Grid.SetRow(line, i);
+                Grid.SetColumnSpan(line, 11);
+                this.MainGrid.Children.Add(line);
+
+                // 仅在最后一行（i == 2）添加底部边界线
+                if (i == 2)
+                {
+                    Line line1 = new Line()
+                    {
+                        Stroke = Brushes.Black,
+                        StrokeThickness = 1,
+                        X1 = 1,
+                        Stretch = Stretch.Fill,
+                        VerticalAlignment = VerticalAlignment.Bottom,
+                    };
+                    Grid.SetColumn(line1, 0);
+                    Grid.SetRow(line1, i);
+                    Grid.SetColumnSpan(line1, 15);
+                    this.MainGrid.Children.Add(line1);
+                }
+            }
+
+
+            #endregion
+
+            #endregion
+
+            #region 画表头
+            TextBlock textBlock = new TextBlock()
+            {
+                Text = "产线名称",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 0);
+            Grid.SetRow(textBlock, 0);
+            Grid.SetRowSpan(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            textBlock = new TextBlock()
+            {
+                Text = "序号",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 0);
+            Grid.SetRow(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            textBlock = new TextBlock()
+            {
+                Text = "检查项目",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 1);
+            Grid.SetRow(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            textBlock = new TextBlock()
+            {
+                Text = LineStr,
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 1);
+            Grid.SetRow(textBlock, 0);
+            Grid.SetRowSpan(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            StackPanel stackPanel = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center,
+            };
+
+            TextBlock textBlock2 = new TextBlock()
+            {
+                Text = "日期:",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+            };
+            stackPanel.Children.Add(textBlock2);
+
+            var datePicker = new DatePicker()
+            {
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                SelectedDate = DateTime.Parse(date)
+            };
+            datePicker.SelectedDateChanged += (s, e) =>
+            {
+                date = ((DatePicker)s).SelectedDate.Value.ToString("yyyy-MM-dd");
+                LoadData();
+            };
+            stackPanel.Children.Add(datePicker);
+            // ✅ 让 StackPanel 跨两行
+            Grid.SetColumn(stackPanel, 2);
+            Grid.SetRow(stackPanel, 0);
+            Grid.SetRowSpan(stackPanel, 2); // ✅ 这里改成对 stackPanel 设置 RowSpan
+            this.MainGrid.Children.Add(stackPanel);
+
+            textBlock = new TextBlock()
+            {
+                Text = "班次",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 3);
+            Grid.SetRow(textBlock, 0);
+            Grid.SetRowSpan(textBlock, 2);
+            Grid.SetColumnSpan(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+            int index = 1;
+            
+            // 假设这是返回的集合
+            textBlock = new TextBlock()
+            {
+                Text = shiftName,
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 5);
+            Grid.SetRow(textBlock, 0);
+            Grid.SetRowSpan(textBlock, 2);
+            Grid.SetColumnSpan(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            textBlock = new TextBlock()
+            {
+                Text = "点检人",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 7);
+            Grid.SetRow(textBlock, 0);
+            Grid.SetRowSpan(textBlock, 2);
+            Grid.SetColumnSpan(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            // 在"点检人"左侧（列索引 7）添加竖线
+            Line lineLeft = new Line()
+            {
+                Stroke = Brushes.Black, // 你可以改成 Black
+                StrokeThickness = 1,  // 线条加粗
+                Y1 = 1,
+                Stretch = Stretch.Fill,
+                HorizontalAlignment = HorizontalAlignment.Left,
+            };
+            Grid.SetColumn(lineLeft, 7);
+            Grid.SetRow(lineLeft, 0);
+            Grid.SetRowSpan(lineLeft, 2);
+            this.MainGrid.Children.Add(lineLeft);
+
+            // 在"点检人"右侧（列索引 8）添加竖线
+            Line lineRight = new Line()
+            {
+                Stroke = Brushes.Black, // 你可以改成 Black
+                StrokeThickness = 1,  // 线条加粗
+                Y1 = 1,
+                Stretch = Stretch.Fill,
+                HorizontalAlignment = HorizontalAlignment.Right,
+            };
+            Grid.SetColumn(lineRight, 8);
+            Grid.SetRow(lineRight, 0);
+            Grid.SetRowSpan(lineRight, 2);
+            this.MainGrid.Children.Add(lineRight);
+
+            textBlock = new TextBlock()
+            {
+                Text = LoginUser.UserName,
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 9);
+            Grid.SetRow(textBlock, 0);
+            Grid.SetRowSpan(textBlock, 2);
+            Grid.SetColumnSpan(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+
+            textBlock = new TextBlock()
+            {
+                Text = "检查标准",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+            Grid.SetColumn(textBlock, 2);
+            Grid.SetRow(textBlock, 2);
+            this.MainGrid.Children.Add(textBlock);
+
+            for (int i = 3; i < 4; i++)
+            {
+                if (i % 2 == 1)
+                {
+                    textBlock = new TextBlock()
+                    {
+                        Text = "检查结果",
+                        FontSize = 18,
+                        FontWeight = FontWeights.Bold,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                    };
+                    Grid.SetColumn(textBlock, i);
+                    Grid.SetRow(textBlock, 2);
+                    Grid.SetColumnSpan(textBlock, 2);
+                    this.MainGrid.Children.Add(textBlock);
+                }
+            }
+
+            textBlock = new TextBlock()
+            {
+                Text = "存在问题",
+                FontSize = 18,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+            };
+
+            // 设置到第3行（索引2）
+            Grid.SetRow(textBlock, 2);
+
+            // 从第6列（索引5）开始
+            Grid.SetColumn(textBlock, 5);
+
+            // **合并6到11列（索引5到10），共6列**
+            Grid.SetColumnSpan(textBlock, 6);
+
+            this.MainGrid.Children.Add(textBlock);
+
+            #endregion
+        }
+
+        private void CheckBox_Checked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox checkBox)
+            {
+                int index = int.Parse(checkBox.Name.Substring(checkBox.Name.Length - 1, 1));
+                if (checkBox.Name.Contains("开线"))
+                {
+                    if (checkBox.IsChecked != null && checkBox.IsChecked.Value)
+                    {
+                        data.Where(t => t.index == index - 1).ForEach(t => t.bz = "1");
+                        foreach (var item in this.MainGrid.Children)
+                        {
+                            if (item is CheckBox checkBox2 && checkBox2.Name == $"清换线{index}")
+                            {
+                                data.Where(t => t.index == index - 1).ForEach(t => t.bz = "1");
+                                checkBox2.IsChecked = false;
+                                break;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        data.Where(t => t.index == index - 1).ForEach(t => t.bz = "");
+                    }
+                }
+                else
+                {
+                    if (checkBox.IsChecked != null && checkBox.IsChecked.Value)
+                    {
+                        data.Where(t => t.index == index - 1).ForEach(t => t.bz = "0");
+                        foreach (var item in this.MainGrid.Children)
+                        {
+                            if (item is CheckBox checkBox1 && checkBox1.Name == $"开线{index}")
+                            {
+                                data.Where(t => t.index == index - 1).ForEach(t => t.bz = "2");
+                                checkBox1.IsChecked = false;
+                                break;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        data.Where(t => t.index == index - 1).ForEach(t => t.bz = "");
+                    }
+                }
+            }
+        }
+
+        private void ToggleButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (((ToggleButton)sender).TemplatedParent is ComboBox comboBox)
+            {
+                comboBox.IsDropDownOpen = !comboBox.IsDropDownOpen;
+            }
+        }
+
+        private void Refresh_Click(object sender, RoutedEventArgs e)
+        {
+            LoadData();
+        }
+
+        private void Add_Click(object sender, RoutedEventArgs e)
+        {
+            LoadData(true);
+        }
+
+        private void Submit_Click(object sender, RoutedEventArgs e)
+        {
+            string isFinal = "0";
+            if (sender is Button button)
+            {
+                isFinal = button.Content.ToString() == "最终提交" ? "1" : "0";
+            }
+            if (isFinal == "1")
+            {
+                var result = MessageBox.Show("是否将报表最终提交？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Question);
+                if (result != MessageBoxResult.Yes)
+                {
+                    return;
+                }
+            }
+            foreach (var item in data)
+            {
+                if (!string.IsNullOrEmpty(item.belong_to))
+                {
+                    var mesTableSelf = dbService.GetMesTableSelfDetialById(item.id);
+                    if (mesTableSelf != null)
+                    {
+                        dbService.UpdateMesTableSelfDetial(item);
+                    }
+                    else if (mesTableSelf == null)
+                    {
+                        dbService.InsertMesTableSelfDetial(item);
+                    }
+                }
+            }
+            mesTableSelf.create_by = LoginUser.UserName;
+            dbService.UpdateMesTableSelf(belong_to, "", LoginUser.UserName, isFinal);
+            MessageBox.Show("保存成功");
+            LoadData();
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml b/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml
index e181b26..121fa42 100644
--- a/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml
+++ b/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml
@@ -13,6 +13,7 @@
             <Button Content="产品转换/完产清线点检表" Width="300" Height="50" Margin="20" Background="LightGreen" Click="Open_ReportForm" />
             <Button Content="自检互检记录表" Width="300" Height="50" Margin="20" Background="LightGreen" Click="Open_SelfForm" />
             <Button Content="产品首检表" Width="300" Height="50" Margin="20" Background="LightGreen" Click="Open_FistForm" />
+            <Button Content="班组安全生产每日点检报表"  Width="300" Height="50" Margin="20" Background="LightGreen" Click="Open_SafeForm"></Button>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml.cs b/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml.cs
index 654bffd..2392f2b 100644
--- a/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/ReportPageSelect.xaml.cs
@@ -56,5 +56,14 @@ namespace XGLFinishPro.Views
             new LanJu_First_Inspection_Reprot().ShowDialog();
             //}
         }
+
+        private void Open_SafeForm(object sender, RoutedEventArgs e)
+        {
+            //new OrderWorkIdSelect().ShowDialog();
+            //if (OrderWorkIdSelect.IsSelect)
+            //{
+            new Lanju_Daily_Check_Report().ShowDialog();
+            //}
+        }
     }
 }
diff --git a/shangjian/XGLFinishPro/XGLFinishPro.csproj b/shangjian/XGLFinishPro/XGLFinishPro.csproj
index ce9a2bd..95d4a5f 100644
--- a/shangjian/XGLFinishPro/XGLFinishPro.csproj
+++ b/shangjian/XGLFinishPro/XGLFinishPro.csproj
@@ -443,6 +443,9 @@
     <Compile Include="Views\LanJu_Conversion_Report.xaml.cs">
       <DependentUpon>LanJu_Conversion_Report.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Lanju_Daily_Check_Report.xaml.cs">
+      <DependentUpon>Lanju_Daily_Check_Report.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\LanJu_First_Inspection_Reprot.xaml.cs">
       <DependentUpon>LanJu_First_Inspection_Reprot.xaml</DependentUpon>
     </Compile>
@@ -744,6 +747,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Lanju_Daily_Check_Report.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\LanJu_First_Inspection_Reprot.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>