diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index b6f9d75..35755d7 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 1d2dc68..ef6896e 100644 --- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application +++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application @@ -1,7 +1,7 @@  - + @@ -14,7 +14,7 @@ - Me9Xo9mBXudYE/51yJuvPG+bparg2CiQ+ufukPtZMoM= + 5nsrkfe5IXcthCM2+m3k9Y4yChx8IqJYU3f1Sxq/sG0= diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe index d386d4b..45a5f7a 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 af8e83c..b5b6b9e 100644 --- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest +++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest @@ -49,7 +49,7 @@ - qnFKF+/3YlPAODyAGRSFG761uj8zOHLBVY6MUaXwrHc= + RdMRkRfxKcw3U8ADB8Tu6YmAoNCF0PI0PcoxnRKNOUU= diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb index c224b13..bd4d823 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 d386d4b..45a5f7a 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 1d2dc68..ef6896e 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application @@ -1,7 +1,7 @@  - + @@ -14,7 +14,7 @@ - Me9Xo9mBXudYE/51yJuvPG+bparg2CiQ+ufukPtZMoM= + 5nsrkfe5IXcthCM2+m3k9Y4yChx8IqJYU3f1Sxq/sG0= diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache index 034c195..e66a975 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.exe b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe index d386d4b..45a5f7a 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 af8e83c..b5b6b9e 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest @@ -49,7 +49,7 @@ - qnFKF+/3YlPAODyAGRSFG761uj8zOHLBVY6MUaXwrHc= + RdMRkRfxKcw3U8ADB8Tu6YmAoNCF0PI0PcoxnRKNOUU= diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb index c224b13..bd4d823 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/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index e087093..d78b945 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 0116a77..8134646 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 778e21f..a3e9eb7 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 6c3a505..324b426 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 c8a57fa..b2eb9d9 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 b36a705..eb05f6f 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 8a82c53..2bb985a 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 2d7d616..3cb4a8c 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 ee4b893..d900f7b 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 6d5f944..b5ddcae 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 3180d60..72c6849 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.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index e087093..d78b945 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 0116a77..8134646 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CommonFunc/HMessageBox.xaml b/shangjian/CommonFunc/HMessageBox.xaml index c7931b5..f00423d 100644 --- a/shangjian/CommonFunc/HMessageBox.xaml +++ b/shangjian/CommonFunc/HMessageBox.xaml @@ -13,7 +13,7 @@ - + + + + + + + + + + + diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll deleted file mode 100644 index 778e21f..0000000 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and /dev/null differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb deleted file mode 100644 index 6c3a505..0000000 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and /dev/null differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll deleted file mode 100644 index 8a82c53..0000000 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll and /dev/null differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb deleted file mode 100644 index 2d7d616..0000000 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and /dev/null differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources deleted file mode 100644 index d0819bb..0000000 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources and /dev/null differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 4ba6f21..0000000 Binary files a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml deleted file mode 100644 index a37e7a9..0000000 Binary files a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml and /dev/null differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs deleted file mode 100644 index 20b677c..0000000 --- a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs +++ /dev/null @@ -1,182 +0,0 @@ -#pragma checksum "..\..\..\HMessageBox.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "12563C2D2B6AD7A166FA845CB2A8EFEEB313B58285E5B146B127F1A94E3E7C1D" -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -using CommonFunc; -using System; -using System.Diagnostics; -using System.Windows; -using System.Windows.Automation; -using System.Windows.Controls; -using System.Windows.Controls.Primitives; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Ink; -using System.Windows.Input; -using System.Windows.Markup; -using System.Windows.Media; -using System.Windows.Media.Animation; -using System.Windows.Media.Effects; -using System.Windows.Media.Imaging; -using System.Windows.Media.Media3D; -using System.Windows.Media.TextFormatting; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.Windows.Shell; - - -namespace CommonFunc { - - - /// - /// HMessageBox - /// - public partial class HMessageBox : System.Windows.Window, System.Windows.Markup.IComponentConnector { - - - #line 16 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image MsgImg; - - #line default - #line hidden - - - #line 34 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock TxtMsg; - - #line default - #line hidden - - - #line 41 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button OkButton; - - #line default - #line hidden - - - #line 43 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button YesButton; - - #line default - #line hidden - - - #line 45 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button NoButton; - - #line default - #line hidden - - - #line 47 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button CancelButton; - - #line default - #line hidden - - private bool _contentLoaded; - - /// - /// InitializeComponent - /// - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] - public void InitializeComponent() { - if (_contentLoaded) { - return; - } - _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/CommonFunc;component/hmessagebox.xaml", System.UriKind.Relative); - - #line 1 "..\..\..\HMessageBox.xaml" - System.Windows.Application.LoadComponent(this, resourceLocater); - - #line default - #line hidden - } - - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] - void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { - switch (connectionId) - { - case 1: - - #line 8 "..\..\..\HMessageBox.xaml" - ((CommonFunc.HMessageBox)(target)).Closed += new System.EventHandler(this.Window_Closed); - - #line default - #line hidden - - #line 8 "..\..\..\HMessageBox.xaml" - ((CommonFunc.HMessageBox)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded); - - #line default - #line hidden - return; - case 2: - this.MsgImg = ((System.Windows.Controls.Image)(target)); - return; - case 3: - this.TxtMsg = ((System.Windows.Controls.TextBlock)(target)); - return; - case 4: - this.OkButton = ((System.Windows.Controls.Button)(target)); - - #line 41 "..\..\..\HMessageBox.xaml" - this.OkButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click); - - #line default - #line hidden - return; - case 5: - this.YesButton = ((System.Windows.Controls.Button)(target)); - - #line 43 "..\..\..\HMessageBox.xaml" - this.YesButton.Click += new System.Windows.RoutedEventHandler(this.YesButton_Click); - - #line default - #line hidden - return; - case 6: - this.NoButton = ((System.Windows.Controls.Button)(target)); - - #line 45 "..\..\..\HMessageBox.xaml" - this.NoButton.Click += new System.Windows.RoutedEventHandler(this.NoButton_Click); - - #line default - #line hidden - return; - case 7: - this.CancelButton = ((System.Windows.Controls.Button)(target)); - - #line 47 "..\..\..\HMessageBox.xaml" - this.CancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click); - - #line default - #line hidden - return; - } - this._contentLoaded = true; - } - } -} - diff --git a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs deleted file mode 100644 index 20b677c..0000000 --- a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs +++ /dev/null @@ -1,182 +0,0 @@ -#pragma checksum "..\..\..\HMessageBox.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "12563C2D2B6AD7A166FA845CB2A8EFEEB313B58285E5B146B127F1A94E3E7C1D" -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -using CommonFunc; -using System; -using System.Diagnostics; -using System.Windows; -using System.Windows.Automation; -using System.Windows.Controls; -using System.Windows.Controls.Primitives; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Ink; -using System.Windows.Input; -using System.Windows.Markup; -using System.Windows.Media; -using System.Windows.Media.Animation; -using System.Windows.Media.Effects; -using System.Windows.Media.Imaging; -using System.Windows.Media.Media3D; -using System.Windows.Media.TextFormatting; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.Windows.Shell; - - -namespace CommonFunc { - - - /// - /// HMessageBox - /// - public partial class HMessageBox : System.Windows.Window, System.Windows.Markup.IComponentConnector { - - - #line 16 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image MsgImg; - - #line default - #line hidden - - - #line 34 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock TxtMsg; - - #line default - #line hidden - - - #line 41 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button OkButton; - - #line default - #line hidden - - - #line 43 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button YesButton; - - #line default - #line hidden - - - #line 45 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button NoButton; - - #line default - #line hidden - - - #line 47 "..\..\..\HMessageBox.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button CancelButton; - - #line default - #line hidden - - private bool _contentLoaded; - - /// - /// InitializeComponent - /// - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] - public void InitializeComponent() { - if (_contentLoaded) { - return; - } - _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/CommonFunc;component/hmessagebox.xaml", System.UriKind.Relative); - - #line 1 "..\..\..\HMessageBox.xaml" - System.Windows.Application.LoadComponent(this, resourceLocater); - - #line default - #line hidden - } - - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] - void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { - switch (connectionId) - { - case 1: - - #line 8 "..\..\..\HMessageBox.xaml" - ((CommonFunc.HMessageBox)(target)).Closed += new System.EventHandler(this.Window_Closed); - - #line default - #line hidden - - #line 8 "..\..\..\HMessageBox.xaml" - ((CommonFunc.HMessageBox)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded); - - #line default - #line hidden - return; - case 2: - this.MsgImg = ((System.Windows.Controls.Image)(target)); - return; - case 3: - this.TxtMsg = ((System.Windows.Controls.TextBlock)(target)); - return; - case 4: - this.OkButton = ((System.Windows.Controls.Button)(target)); - - #line 41 "..\..\..\HMessageBox.xaml" - this.OkButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click); - - #line default - #line hidden - return; - case 5: - this.YesButton = ((System.Windows.Controls.Button)(target)); - - #line 43 "..\..\..\HMessageBox.xaml" - this.YesButton.Click += new System.Windows.RoutedEventHandler(this.YesButton_Click); - - #line default - #line hidden - return; - case 6: - this.NoButton = ((System.Windows.Controls.Button)(target)); - - #line 45 "..\..\..\HMessageBox.xaml" - this.NoButton.Click += new System.Windows.RoutedEventHandler(this.NoButton_Click); - - #line default - #line hidden - return; - case 7: - this.CancelButton = ((System.Windows.Controls.Button)(target)); - - #line 47 "..\..\..\HMessageBox.xaml" - this.CancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click); - - #line default - #line hidden - return; - } - this._contentLoaded = true; - } - } -} - diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache index e653b41..b7c22d6 100644 Binary files a/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache and b/shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index 778e21f..a3e9eb7 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 6c3a505..324b426 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/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index 8a82c53..2bb985a 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 2d7d616..3cb4a8c 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/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index d03db2e..93cbdb5 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/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache index e8472d7..fba2e64 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/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index a637ace..ef41e3a 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -280,7 +280,7 @@ VALUES /// /// /// - public bool ExecuteReportWork(DataRowView selectRow,string workCount, string reportCode, string workTime, string userCount, string costCenter, string deviceCode) + public bool ExecuteReportWork(DataRowView selectRow,string workCount, string reportCode, string workTime, string userCount, string costCenter, string batchCode, string isEndReport, string deviceCode) { string getReportCodeSql = $@"SELECT equipment_code,equipment_name FROM [dbo].[base_equipment] WHERE equipment_code='{deviceCode}'"; string lineName = ""; @@ -297,7 +297,7 @@ VALUES [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], - [use_man], [work_center]) + [use_man], [work_center],[del_flag],[batch],[end_report]) VALUES ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{selectRow["workorder_code"]}', '{selectRow["product_code"]}', '{selectRow["product_name"]}', '{selectRow["product_spc"]}', '{selectRow["unit"]}', {workCount}, {workCount}, 0, 0, @@ -305,7 +305,7 @@ VALUES '无', '{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', - {userCount}, '{costCenter}');"; + {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}');"; //赵啸林说不用上位机更新报工标识 //string updateOrderSql = $@"update pro_order_workorder set status = 'w3', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{selectRow["workorder_id"]}' "; sqlList.Add(sql); diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs index bd9d67c..a93515e 100644 --- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs +++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs @@ -494,12 +494,12 @@ 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 +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 from pro_order_workorder workorder left JOIN base_shifts_t shifts on workorder.shift_id = shifts.shift_id left JOIN pro_order_workorder_batch batch on workorder.workorder_id = batch.workorder_id where 1=1 and batch.del_flag = 0 and workorder.del_flag = 0 and - workorder.parent_order ='0' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%'"; + workorder.parent_order ='0' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%' order by sort_no"; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) { diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache deleted file mode 100644 index 21f8e08..0000000 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and /dev/null differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll deleted file mode 100644 index c8a57fa..0000000 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and /dev/null differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb deleted file mode 100644 index b36a705..0000000 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and /dev/null differ diff --git a/shangjian/XGL.Data/userDB.cs b/shangjian/XGL.Data/userDB.cs index d60fa60..c917e4a 100644 --- a/shangjian/XGL.Data/userDB.cs +++ b/shangjian/XGL.Data/userDB.cs @@ -178,6 +178,8 @@ namespace XGL.Data } } + + /// /// 批量删除一批数据 /// @@ -335,6 +337,12 @@ namespace XGL.Data return issuccess;//lst.Count > 0 ? true : false; } + public bool UpdateWorkDate(string deviceCode,string shiftID, string workDate) + { + string sql = $"update base_equipment set curr_work_date = '{workDate}',curr_shift = '{shiftID}' where equipment_code = '{deviceCode}'"; + return Utils.netClientDBHelper.executeUpdate(sql) > 0 ? true : false; + } + /// /// 查询版本号 /// diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 8a82c53..2bb985a 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 2d7d616..3cb4a8c 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/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index 8a82c53..2bb985a 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 2d7d616..3cb4a8c 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 ee4b893..d900f7b 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 6d5f944..b5ddcae 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/XGL.Thrift.csproj.AssemblyReference.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache index cf52ee4..3b7402d 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.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index ee4b893..d900f7b 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 6d5f944..b5ddcae 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/XGL/App.config b/shangjian/XGL/App.config index 2138ec3..361d988 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -12,14 +12,14 @@ - + - + - + - + diff --git a/shangjian/XGL/LoginPage.xaml b/shangjian/XGL/LoginPage.xaml index 15c38e2..343c875 100644 --- a/shangjian/XGL/LoginPage.xaml +++ b/shangjian/XGL/LoginPage.xaml @@ -7,7 +7,7 @@ xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:loadin="clr-namespace:LoadingIndicators.WPF;assembly=LoadingIndicators.WPF" - Title="Login" Height="500" Width="350" ResizeMode="NoResize" WindowStyle="None" + Title="Login" Height="530" Width="350" ResizeMode="NoResize" WindowStyle="None" xmlns:customControlLibrary1="clr-namespace:WpfCustomControlLibrary1;assembly=WpfCustomControlLibrary1" WindowStartupLocation="CenterScreen" MouseLeftButtonDown="Window_MouseLeftButtonDown" Loaded="Window_Loaded"> @@ -19,9 +19,9 @@ - - - + + + @@ -31,37 +31,57 @@ -