diff --git a/shangjian/.vs/BL/FileContentIndex/read.lock b/shangjian/.vs/BL/FileContentIndex/read.lock deleted file mode 100644 index e69de29..0000000 diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 0e10cb5..ff73ee8 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application index 9c62ebc..b3f5981 100644 --- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application +++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application @@ -14,7 +14,7 @@ - 2xT7WSJ3JOGwOwaH5T5VSLO0545A2bhrSpA8Se3jmhE= + c0Rf+CYPtsvtvSUmXds9V3/rrktlKG3rzjN5DuQeWaE= diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe index d504fe3..9cb634b 100644 Binary files a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe and b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe differ diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest index cf3533d..c9ccd2f 100644 --- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest +++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest @@ -49,7 +49,7 @@ - y6yzsU8Eugy+ObfgrPA463CS+Nq1+410yHtpvzJQ8xU= + JYnml/VunFI2cpX5vz9XEjoQbR4ehe5wE83P4SCElVc= diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb index be69bde..e0497d2 100644 Binary files a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb and b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb differ diff --git a/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe index d504fe3..9cb634b 100644 Binary files a/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe and b/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application index 9c62ebc..b3f5981 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application @@ -14,7 +14,7 @@ - 2xT7WSJ3JOGwOwaH5T5VSLO0545A2bhrSpA8Se3jmhE= + c0Rf+CYPtsvtvSUmXds9V3/rrktlKG3rzjN5DuQeWaE= diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache index 9d3e48a..0f5ecf5 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache index 3e54865..8ae2882 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f67dc885e7551d573c533635607a154a9fcfd039 +1f5ed4a1723419f2b246081115bd24bc58c59cead28db53d676e7670d15749c1 diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt index eeebc01..c56be41 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt @@ -41,7 +41,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoU D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.pdb D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\SevenZipSharp.dll D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.AssemblyReference.cache -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.SuggestedBindingRedirects.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.Properties.Resources.resources D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.GenerateResource.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CoreCompileInputs.cache diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.SuggestedBindingRedirects.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.SuggestedBindingRedirects.cache deleted file mode 100644 index e69de29..0000000 diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe index d504fe3..9cb634b 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest index cf3533d..c9ccd2f 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest @@ -49,7 +49,7 @@ - y6yzsU8Eugy+ObfgrPA463CS+Nq1+410yHtpvzJQ8xU= + JYnml/VunFI2cpX5vz9XEjoQbR4ehe5wE83P4SCElVc= diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb index be69bde..e0497d2 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 946926c..987c783 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index c5f37b8..f8026f2 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb index 86384a2..2bc89f9 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll index 6b5fe25..e91188f 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb index c8ca0b1..ed3a64c 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll index 6933538..fe478a3 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb index c5c2d76..ade65f8 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.dll b/shangjian/CentralControl/bin/Debug/XGL.Models.dll index c15d680..4a02928 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.dll and b/shangjian/CentralControl/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb index 45c8be0..658c204 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll index ed15325..cac0fde 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb index 7ca5103..874b283 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index 8743c64..9d3a58b 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache index bd9c3bb..d925b38 100644 --- a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache +++ b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -65ea42614d5210ce1f76f304a0b99eadc686e4a3 +3a8b54561118364882d34afa00a4d4a6d0f2189460f273b8a358f50296b9afd5 diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.FileListAbsolute.txt b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.FileListAbsolute.txt index ca002ea..5bd2385 100644 --- a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.FileListAbsolute.txt +++ b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.FileListAbsolute.txt @@ -103,7 +103,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\bin\Debug\S D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\bin\Debug\System.Buffers.xml D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.AssemblyReference.cache -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.SuggestedBindingRedirects.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.CoreCompileInputs.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.CopyComplete D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.exe diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.SuggestedBindingRedirects.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.SuggestedBindingRedirects.cache deleted file mode 100644 index e69de29..0000000 diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index c5f37b8..f8026f2 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb index 86384a2..2bc89f9 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index af63f5e..99a5054 100644 Binary files a/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/CommonFunc/CommonFunc.csproj b/shangjian/CommonFunc/CommonFunc.csproj index df5129a..520e64a 100644 --- a/shangjian/CommonFunc/CommonFunc.csproj +++ b/shangjian/CommonFunc/CommonFunc.csproj @@ -157,6 +157,9 @@ + + MachineRepairWin.xaml + PauseOrderWin.xaml @@ -187,6 +190,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml new file mode 100644 index 0000000..f1eef01 --- /dev/null +++ b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs new file mode 100644 index 0000000..ca381a6 --- /dev/null +++ b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace CommonFunc.Tools +{ + /// + /// MachineRepairWin.xaml 的交互逻辑 + /// + public partial class MachineRepairWin : Window + { + public MachineRepairWin() + { + InitializeComponent(); + } + } +} diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache index 24d15bf..1fe1010 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -480f634d4a501bb2823c222d358be062c929427a +eafdca6ee748aec506bd217d6273757fffaf4aa4e66b7b29256414d0c9c09633 diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt index e36db4c..1c1aa10 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt @@ -86,3 +86,5 @@ E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.C E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\MachineRepairWin.g.cs +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\MachineRepairWin.baml diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache index fbf00d0..91851d3 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache @@ -10,11 +10,11 @@ none false DEBUG;TRACE -3601143984 +489050341 2-1355062061 -261069671320 +27790667083 44-239516262 -HMessageBox.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml; +HMessageBox.xaml;Tools\MachineRepairWin.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml; False diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache index da11fc5..d051103 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache @@ -10,11 +10,11 @@ none false DEBUG;TRACE -3601143984 +489050341 2-1355062061 -27-342350437 +28-621354674 44-239516262 -HMessageBox.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml; +HMessageBox.xaml;Tools\MachineRepairWin.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml; True diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref index da2c703..07f0be8 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref @@ -1,4 +1,5 @@  FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Tools\MachineRepairWin.xaml;; diff --git a/shangjian/LanJu/bin/Debug/LanJu.exe b/shangjian/LanJu/bin/Debug/LanJu.exe index 7587aba..3791cef 100644 Binary files a/shangjian/LanJu/bin/Debug/LanJu.exe and b/shangjian/LanJu/bin/Debug/LanJu.exe differ diff --git a/shangjian/LanJu/bin/Debug/LanJu.pdb b/shangjian/LanJu/bin/Debug/LanJu.pdb index 8e82317..98b3ee5 100644 Binary files a/shangjian/LanJu/bin/Debug/LanJu.pdb and b/shangjian/LanJu/bin/Debug/LanJu.pdb differ diff --git a/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e58152e..6645886 100644 Binary files a/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache index 419e11d..6c695b1 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache and b/shangjian/LanJu/obj/Debug/LanJu.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache index a0fb44e..c16b728 100644 --- a/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -51790d22c3b0468f4e446c933001b592c3e5c2c3 +0589fc8b80df15b5ed1fb9c321c7c48cc898e947eb7c61bb98cfa82107a585a4 diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.FileListAbsolute.txt b/shangjian/LanJu/obj/Debug/LanJu.csproj.FileListAbsolute.txt index 7950b8f..10ac203 100644 --- a/shangjian/LanJu/obj/Debug/LanJu.csproj.FileListAbsolute.txt +++ b/shangjian/LanJu/obj/Debug/LanJu.csproj.FileListAbsolute.txt @@ -66,7 +66,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\bin\Debug\LanJu.exe. D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\bin\Debug\LanJu.exe D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\bin\Debug\LanJu.pdb D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\LanJu.csproj.AssemblyReference.cache -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\LanJu.csproj.SuggestedBindingRedirects.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\MainWindow.g.cs D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\Views\LanJu_Complete.g.cs D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\Views\LanJu_DeviceItems.g.cs diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.SuggestedBindingRedirects.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.SuggestedBindingRedirects.cache deleted file mode 100644 index e69de29..0000000 diff --git a/shangjian/LanJu/obj/Debug/LanJu.exe b/shangjian/LanJu/obj/Debug/LanJu.exe index 7587aba..3791cef 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.exe and b/shangjian/LanJu/obj/Debug/LanJu.exe differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.pdb b/shangjian/LanJu/obj/Debug/LanJu.pdb index 8e82317..98b3ee5 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.pdb and b/shangjian/LanJu/obj/Debug/LanJu.pdb differ diff --git a/shangjian/LanJuControl/bin/Debug/LanJuControl.exe b/shangjian/LanJuControl/bin/Debug/LanJuControl.exe index 396cfd1..07b3dea 100644 Binary files a/shangjian/LanJuControl/bin/Debug/LanJuControl.exe and b/shangjian/LanJuControl/bin/Debug/LanJuControl.exe differ diff --git a/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb b/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb index 89126ea..703dee1 100644 Binary files a/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb and b/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb differ diff --git a/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a5b3f8a..540ded4 100644 Binary files a/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.CoreCompileInputs.cache b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.CoreCompileInputs.cache index 0c63285..01d20de 100644 --- a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2f1b5aa9ca9324e732c8dc8ad98b9a6b4836d80a +25f359d3fd7d560a1dec87ab383b84f91627954af157e6d29c6e8f4a1e97b265 diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.FileListAbsolute.txt b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.FileListAbsolute.txt index aad6a65..8b0d064 100644 --- a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.FileListAbsolute.txt +++ b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.FileListAbsolute.txt @@ -18,7 +18,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\bin\Debug\Lan D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\bin\Debug\LanJuControl.exe D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\bin\Debug\LanJuControl.pdb D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.csproj.AssemblyReference.cache -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.csproj.SuggestedBindingRedirects.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.csproj.CoreCompileInputs.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.exe D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.pdb diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.SuggestedBindingRedirects.cache b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.SuggestedBindingRedirects.cache deleted file mode 100644 index e69de29..0000000 diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.exe b/shangjian/LanJuControl/obj/Debug/LanJuControl.exe index 396cfd1..07b3dea 100644 Binary files a/shangjian/LanJuControl/obj/Debug/LanJuControl.exe and b/shangjian/LanJuControl/obj/Debug/LanJuControl.exe differ diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb b/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb index 89126ea..703dee1 100644 Binary files a/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb and b/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index 6b5fe25..e91188f 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb index c8ca0b1..ed3a64c 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll index 26b49a0..98a63de 100644 Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll and b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb index a6ba9df..1eec05b 100644 Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index c15d680..4a02928 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll and b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb index 45c8be0..658c204 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a1434b8..797f51f 100644 Binary files a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index dd29585..aad05bc 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache index cc8d6fc..4713734 100644 --- a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -75b64367c22655afbbe469bfdef148da7e480363 +ab6200e7439de6fae56f8e5e273baab411e88f2aca14c5503b8c523b97872741 diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll index 26b49a0..98a63de 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll and b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb index a6ba9df..1eec05b 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb differ diff --git a/shangjian/RestartApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/RestartApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3dcb42c..1d15c05 100644 Binary files a/shangjian/RestartApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/RestartApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/WPFupdate/bin/Debug/WPFupdate.exe b/shangjian/WPFupdate/bin/Debug/WPFupdate.exe index 0ccd018..684ee7d 100644 Binary files a/shangjian/WPFupdate/bin/Debug/WPFupdate.exe and b/shangjian/WPFupdate/bin/Debug/WPFupdate.exe differ diff --git a/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb b/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb index 35ef551..816b430 100644 Binary files a/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb and b/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb differ diff --git a/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ff4e22b..0792d25 100644 Binary files a/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache index 03498a4..293b360 100644 Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache and b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache differ diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache index c367b0a..8a31529 100644 --- a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache +++ b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -57f46a9d84fe0cf9b52d094f86f1528843920246 +69f46fa79bc0e95799efe49dbdaf9ca40810cf68925408e6bb5441d8be91b8fd diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt index e6eca53..0a0c9f0 100644 --- a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt +++ b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt @@ -5,7 +5,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAg D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.pdb D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.xml D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.AssemblyReference.cache -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.SuggestedBindingRedirects.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CoreCompileInputs.cache D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.SuggestedBindingRedirects.cache b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.SuggestedBindingRedirects.cache deleted file mode 100644 index e69de29..0000000 diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.exe b/shangjian/WPFupdate/obj/Debug/WPFupdate.exe index 0ccd018..684ee7d 100644 Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.exe and b/shangjian/WPFupdate/obj/Debug/WPFupdate.exe differ diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb b/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb index 35ef551..816b430 100644 Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb and b/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb differ diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 56e0f39..c0c4f44 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -466,7 +466,7 @@ VALUES [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code], [attr1], [attr2], [attr3], [attr4], [create_by], [create_time], - [update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type], + [update_time], [update_by], [upload_status], [upload_msg], [prod_type], [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) VALUES ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{selectRow["workorder_code"]}', '{selectRow["product_code"]}', '{selectRow["product_name"]}', @@ -474,7 +474,7 @@ VALUES '{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE', '无', '{workTime}', '{deviceCode}', '{lineName}', N'{LoginUser.TeamCode}', '{selectRow["shift_id"]}', NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', - '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0', NULL, 'prod', + '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}' '0', NULL, 'prod', {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}','{0}','{LoginUser.CurrDeviceIP}','{LoginUser.Version}');"; string subOrderSql = $@"INSERT INTO [dbo].[mes_report_work] @@ -483,7 +483,7 @@ VALUES [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code], [attr1], [attr2], [attr3], [attr4], [create_by], [create_time], - [update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type], + [update_time], [update_by], [upload_status], [upload_msg], [prod_type], [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) VALUES ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{subOrder}', '{subProductCode}', '{subProductName}', @@ -491,7 +491,7 @@ VALUES '{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE', '无', '{workTime}', '{deviceCode}', '{lineName}', N'{LoginUser.TeamCode}', '{selectRow["shift_id"]}', NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', - '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0', NULL, 'prod', + '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', '0', NULL, 'prod', {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}','{selectRow["workorder_code"]}','{LoginUser.CurrDeviceIP}','{LoginUser.Version}');"; sqlList.Add(mainOrderSql); sqlList.Add(subOrderSql); @@ -505,7 +505,7 @@ VALUES [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code], [attr1], [attr2], [attr3], [attr4], [create_by], [create_time], - [update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type], + [update_time], [update_by], [upload_status], [upload_msg], [prod_type], [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) VALUES ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{selectRow["workorder_code"]}', '{selectRow["product_code"]}', '{selectRow["product_name"]}', @@ -513,7 +513,7 @@ VALUES '{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE', '无', '{workTime}', '{deviceCode}', '{lineName}', N'{LoginUser.TeamCode}', '{selectRow["shift_id"]}', NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', - '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0', NULL, 'prod', + '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', '0', NULL, 'prod', {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}','{selectRow["parent_order"]}','{LoginUser.CurrDeviceIP}','{LoginUser.Version}');"; sqlList.Add(mainOrderSql); } diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs index 7669856..0325606 100644 --- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs +++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs @@ -515,7 +515,7 @@ select a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber public DataTable GetWetPlanInfo(string deviceCode, string date) { string sql = $@"select workorder.factory_code,workorder.product_date as plan_time, workorder.workorder_id,workorder.workorder_code, product_code,product_name, -product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id ,batch.batch_code,batch.batch_quantity,sort_no, workorder.parent_order,batch.qc_status,batch.status as batchStatus +product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id ,batch.batch_code,batch.batch_quantity,sort_no, workorder.parent_order,batch.qc_status,batch.status as batchStatus,workorder_code_sap from pro_order_workorder workorder WITH (NOLOCK) left JOIN base_shifts_t shifts WITH (NOLOCK) on workorder.shift_id = shifts.shift_id left JOIN pro_order_workorder_batch batch WITH (NOLOCK) on workorder.workorder_id = batch.workorder_id diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe b/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe index 7587aba..3791cef 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe and b/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb index 8e82317..98b3ee5 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe index 396cfd1..07b3dea 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe and b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb index 89126ea..703dee1 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll index 26b49a0..98a63de 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb index a6ba9df..1eec05b 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 17c5389..7eda1a8 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache index 88faf32..0330b12 100644 --- a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -71f6ce92ed5dcb89571c00831dde3abe158ec5db +9632f572e4e99b96159e5a32041c3dab14c406f4801ba34f3987b9c789ca7320 diff --git a/shangjian/XGL.Model/Model/MachineRepairModel.cs b/shangjian/XGL.Model/Model/MachineRepairModel.cs new file mode 100644 index 0000000..a17956e --- /dev/null +++ b/shangjian/XGL.Model/Model/MachineRepairModel.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Models.Model +{ + /// + /// 设备报修 equipmentCode（设备编码）、factory（工厂源）、userName（用户账号）、phoneNumber（联系方式）、userNickName（用户昵称） + /// + public class MachineRepairModel + { + public string equipmentCode { get; set; } + public string factory { get; set; } + public string userName { get; set; } + public string phoneNumber { get; set; } + public string userNickName { get; set; } + } +} diff --git a/shangjian/XGL.Model/XGL.Models.csproj b/shangjian/XGL.Model/XGL.Models.csproj index 45f91be..1386420 100644 --- a/shangjian/XGL.Model/XGL.Models.csproj +++ b/shangjian/XGL.Model/XGL.Models.csproj @@ -102,6 +102,7 @@ + diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index c15d680..4a02928 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll and b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb index 45c8be0..658c204 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1a962e1..b5bcc84 100644 Binary files a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache index be05721..b1e3e18 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache and b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache index 44a59d0..7845f7a 100644 --- a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0cc4d60a314f2e3943ed817c62d6179b8b14a6f2 +5f00ecb14f7afd118f8e6223592f4c0db809a44632bf5fbb9a572b0694f950ff diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index c15d680..4a02928 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll and b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb index 45c8be0..658c204 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll index ed15325..cac0fde 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb index 7ca5103..874b283 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 44594cb..d5e7967 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache index bbf53b4..9048442 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache index ffad49a..fcad6bd 100644 --- a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4c1eda63a6eb933282d4915d9cfa5b18a18739b1 +47d52ae39edacbdf8c5bd3cb9159b8e9ba6d8840708d98c492b9255ab8c37239 diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index ed15325..cac0fde 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb index 7ca5103..874b283 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGLFinishPro/App.config b/shangjian/XGLFinishPro/App.config index 5da0c1f..b1c93a5 100644 --- a/shangjian/XGLFinishPro/App.config +++ b/shangjian/XGLFinishPro/App.config @@ -10,9 +10,9 @@ - + - + diff --git a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml index d9009b1..e27a8da 100644 --- a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml +++ b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml @@ -186,11 +186,11 @@ - + + - diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml index 98cab67..88b11d6 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml @@ -406,10 +406,25 @@ + + +