diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 9c0562e..2a1108d 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index 111e9b2..846b5b3 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 521cb9c..2151828 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 4978f04..1b413f7 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 84f3206..8f7c928 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 5300a00..8b53b41 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 dedf5ee..3d70263 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 66fb336..4d8b7e6 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 9cc2921..1c91e86 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 86f377d..525fcb2 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 c7e21c7..74b1810 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 0be795d..078a033 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 111e9b2..846b5b3 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 521cb9c..2151828 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CommonFunc/CommonFunc.csproj b/shangjian/CommonFunc/CommonFunc.csproj index fc9087b..7e9fcb2 100644 --- a/shangjian/CommonFunc/CommonFunc.csproj +++ b/shangjian/CommonFunc/CommonFunc.csproj @@ -181,6 +181,19 @@ + + Always + + + + Always + + + Always + + + Always + diff --git a/shangjian/CommonFunc/HMessageBox.xaml b/shangjian/CommonFunc/HMessageBox.xaml index 8c3f60a..2a8a7f8 100644 --- a/shangjian/CommonFunc/HMessageBox.xaml +++ b/shangjian/CommonFunc/HMessageBox.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:CommonFunc" mc:Ignorable="d" - Title="HMessageBox" Height="210" Width="420" WindowStartupLocation="CenterScreen" WindowStyle="None" BorderThickness="1,1,1,1" ResizeMode="NoResize" Closed="Window_Closed"> + Title="HMessageBox" Height="210" Width="420" WindowStartupLocation="CenterScreen" WindowStyle="None" BorderThickness="1,1,1,1" ResizeMode="NoResize" Closed="Window_Closed" Loaded="Window_Loaded"> @@ -13,7 +13,24 @@ - + + + + + + + + + + + + + + + + + + diff --git a/shangjian/CommonFunc/HMessageBox.xaml.cs b/shangjian/CommonFunc/HMessageBox.xaml.cs index 924a7a3..a6ec737 100644 --- a/shangjian/CommonFunc/HMessageBox.xaml.cs +++ b/shangjian/CommonFunc/HMessageBox.xaml.cs @@ -10,6 +10,7 @@ using System.Windows.Data; using System.Windows.Documents; using System.Windows.Input; using System.Windows.Media; +using System.Windows.Media.Animation; using System.Windows.Media.Imaging; using System.Windows.Shapes; @@ -99,5 +100,49 @@ namespace CommonFunc Result = CustomMessageBoxResult.Cancel; this.Close(); } + + private void Window_Loaded(object sender, RoutedEventArgs e) + { + //while (true) + //{ + // // 创建一个Storyboard对象 + // Storyboard storyboard = new Storyboard(); + + // // 创建一个DoubleAnimation对象，设置动画的起始值和结束值 + // DoubleAnimation animation = new DoubleAnimation(); + // animation.From = 0.0; // 完全显示 + // animation.To = 1.0; // 完全隐藏 + // animation.Duration = new Duration(TimeSpan.FromSeconds(1)); // 动画的持续时间 + + // // 将DoubleAnimation对象添加到Storyboard中，并指定要动画的属性 + // Storyboard.SetTarget(animation, MsgImg); + // Storyboard.SetTargetProperty(animation, new PropertyPath("Opacity")); + + // // 将动画添加到Storyboard中 + // storyboard.Children.Add(animation); + + // // 启动动画 + // storyboard.Begin(); + + // // 创建一个Storyboard对象 + // Storyboard storyboard1 = new Storyboard(); + + // // 创建一个DoubleAnimation对象，设置动画的起始值和结束值 + // DoubleAnimation animation1 = new DoubleAnimation(); + // animation1.From = 1.0; // 完全显示 + // animation1.To = 0.0; // 完全隐藏 + // animation1.Duration = new Duration(TimeSpan.FromSeconds(1)); // 动画的持续时间 + + // // 将DoubleAnimation对象添加到Storyboard中，并指定要动画的属性 + // Storyboard.SetTarget(animation1, MsgImg); + // Storyboard.SetTargetProperty(animation1, new PropertyPath("Opacity")); + + // // 将动画添加到Storyboard中 + // storyboard1.Children.Add(animation1); + + // // 启动动画 + // storyboard1.Begin(); + //} + } } } diff --git a/shangjian/CommonFunc/Resources/COSMOPlat-logo.png b/shangjian/CommonFunc/Resources/COSMOPlat-logo.png new file mode 100644 index 0000000..25d174d Binary files /dev/null and b/shangjian/CommonFunc/Resources/COSMOPlat-logo.png differ diff --git a/shangjian/CommonFunc/Resources/Error.png b/shangjian/CommonFunc/Resources/Error.png new file mode 100644 index 0000000..89b05ae Binary files /dev/null and b/shangjian/CommonFunc/Resources/Error.png differ diff --git a/shangjian/CommonFunc/Resources/Success.png b/shangjian/CommonFunc/Resources/Success.png new file mode 100644 index 0000000..1a06815 Binary files /dev/null and b/shangjian/CommonFunc/Resources/Success.png differ diff --git a/shangjian/CommonFunc/Resources/alert.png b/shangjian/CommonFunc/Resources/alert.png new file mode 100644 index 0000000..b83e589 Binary files /dev/null and b/shangjian/CommonFunc/Resources/alert.png differ diff --git a/shangjian/CommonFunc/Resources/question.png b/shangjian/CommonFunc/Resources/question.png new file mode 100644 index 0000000..3a7eb75 Binary files /dev/null and b/shangjian/CommonFunc/Resources/question.png differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll index 4978f04..1b413f7 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb index 84f3206..8f7c928 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll index 66fb336..4d8b7e6 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb index 9cc2921..1c91e86 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache index b37bf45..07e8383 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll index 4978f04..1b413f7 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources index 9a9ef87..cb6b1c7 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.g.resources differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb index 84f3206..8f7c928 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache index e773f34..7036cf7 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache @@ -11,7 +11,7 @@ false DEBUG;TRACE 12023204370 -11419817861 +2-1355062061 241494203934 44-550732465 HMessageBox.xaml; diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache index 5e745a0..1414b15 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache @@ -11,7 +11,7 @@ false DEBUG;TRACE 12023204370 -11419817861 +2-1355062061 2582182177 44-550732465 HMessageBox.xaml; diff --git a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a3d0b73..52ecdc8 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml index ac85f7f..adf7b29 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml and b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.baml differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs index d2ea9af..63bc7b2 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs +++ b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\HMessageBox.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9E7620BB079A502B1C3ED525D834319B9FC6090C5498CAFE30DA88CDE63BF283" +#pragma checksum "..\..\..\HMessageBox.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "249D6DC52E87AB6F146D09ECCBBF38A48881D5C3B90A64E0B49F7B7181113186" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -49,7 +49,7 @@ namespace CommonFunc { #line hidden - #line 17 "..\..\..\HMessageBox.xaml" + #line 34 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock TxtMsg; @@ -57,7 +57,7 @@ namespace CommonFunc { #line hidden - #line 24 "..\..\..\HMessageBox.xaml" + #line 41 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button OkButton; @@ -65,7 +65,7 @@ namespace CommonFunc { #line hidden - #line 26 "..\..\..\HMessageBox.xaml" + #line 43 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button YesButton; @@ -73,7 +73,7 @@ namespace CommonFunc { #line hidden - #line 28 "..\..\..\HMessageBox.xaml" + #line 45 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button NoButton; @@ -81,7 +81,7 @@ namespace CommonFunc { #line hidden - #line 30 "..\..\..\HMessageBox.xaml" + #line 47 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button CancelButton; @@ -123,6 +123,12 @@ namespace CommonFunc { #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; @@ -135,7 +141,7 @@ namespace CommonFunc { case 4: this.OkButton = ((System.Windows.Controls.Button)(target)); - #line 24 "..\..\..\HMessageBox.xaml" + #line 41 "..\..\..\HMessageBox.xaml" this.OkButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click); #line default @@ -144,7 +150,7 @@ namespace CommonFunc { case 5: this.YesButton = ((System.Windows.Controls.Button)(target)); - #line 26 "..\..\..\HMessageBox.xaml" + #line 43 "..\..\..\HMessageBox.xaml" this.YesButton.Click += new System.Windows.RoutedEventHandler(this.YesButton_Click); #line default @@ -153,7 +159,7 @@ namespace CommonFunc { case 6: this.NoButton = ((System.Windows.Controls.Button)(target)); - #line 28 "..\..\..\HMessageBox.xaml" + #line 45 "..\..\..\HMessageBox.xaml" this.NoButton.Click += new System.Windows.RoutedEventHandler(this.NoButton_Click); #line default @@ -162,7 +168,7 @@ namespace CommonFunc { case 7: this.CancelButton = ((System.Windows.Controls.Button)(target)); - #line 30 "..\..\..\HMessageBox.xaml" + #line 47 "..\..\..\HMessageBox.xaml" this.CancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click); #line default diff --git a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs index d2ea9af..63bc7b2 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs +++ b/shangjian/CommonFunc/obj/x86/Debug/HMessageBox.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\HMessageBox.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9E7620BB079A502B1C3ED525D834319B9FC6090C5498CAFE30DA88CDE63BF283" +#pragma checksum "..\..\..\HMessageBox.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "249D6DC52E87AB6F146D09ECCBBF38A48881D5C3B90A64E0B49F7B7181113186" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -49,7 +49,7 @@ namespace CommonFunc { #line hidden - #line 17 "..\..\..\HMessageBox.xaml" + #line 34 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock TxtMsg; @@ -57,7 +57,7 @@ namespace CommonFunc { #line hidden - #line 24 "..\..\..\HMessageBox.xaml" + #line 41 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button OkButton; @@ -65,7 +65,7 @@ namespace CommonFunc { #line hidden - #line 26 "..\..\..\HMessageBox.xaml" + #line 43 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button YesButton; @@ -73,7 +73,7 @@ namespace CommonFunc { #line hidden - #line 28 "..\..\..\HMessageBox.xaml" + #line 45 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button NoButton; @@ -81,7 +81,7 @@ namespace CommonFunc { #line hidden - #line 30 "..\..\..\HMessageBox.xaml" + #line 47 "..\..\..\HMessageBox.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button CancelButton; @@ -123,6 +123,12 @@ namespace CommonFunc { #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; @@ -135,7 +141,7 @@ namespace CommonFunc { case 4: this.OkButton = ((System.Windows.Controls.Button)(target)); - #line 24 "..\..\..\HMessageBox.xaml" + #line 41 "..\..\..\HMessageBox.xaml" this.OkButton.Click += new System.Windows.RoutedEventHandler(this.OkButton_Click); #line default @@ -144,7 +150,7 @@ namespace CommonFunc { case 5: this.YesButton = ((System.Windows.Controls.Button)(target)); - #line 26 "..\..\..\HMessageBox.xaml" + #line 43 "..\..\..\HMessageBox.xaml" this.YesButton.Click += new System.Windows.RoutedEventHandler(this.YesButton_Click); #line default @@ -153,7 +159,7 @@ namespace CommonFunc { case 6: this.NoButton = ((System.Windows.Controls.Button)(target)); - #line 28 "..\..\..\HMessageBox.xaml" + #line 45 "..\..\..\HMessageBox.xaml" this.NoButton.Click += new System.Windows.RoutedEventHandler(this.NoButton_Click); #line default @@ -162,7 +168,7 @@ namespace CommonFunc { case 7: this.CancelButton = ((System.Windows.Controls.Button)(target)); - #line 30 "..\..\..\HMessageBox.xaml" + #line 47 "..\..\..\HMessageBox.xaml" this.CancelButton.Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click); #line default diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index 4978f04..1b413f7 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 84f3206..8f7c928 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 66fb336..4d8b7e6 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 9cc2921..1c91e86 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 6b88238..700da0f 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/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs index dc53d6d..7e9b880 100644 --- a/shangjian/XGL.Data/DBService/DBService.cs +++ b/shangjian/XGL.Data/DBService/DBService.cs @@ -669,19 +669,26 @@ left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.wo return null; } + /// + /// 获取湿料计划指向的成型机 + /// + /// + public DataTable GetCXJList(string workOrderNo) + { + string sql = $@"select prod_line_code + from pro_wet_material_plan wet + LEFT JOIN pro_wet_material_plan_detail wetDetail + on wet.id = wetDetail.wet_material_plan_id + left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id + where wet.id = '{workOrderNo}'"; - - - - - - - - - - - - + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index 4978f04..1b413f7 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb index 84f3206..8f7c928 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll index 5300a00..8b53b41 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb index dedf5ee..3d70263 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll index 66fb336..4d8b7e6 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb index 9cc2921..1c91e86 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb differ 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 index 94cd390..8ed1c66 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll index 5300a00..8b53b41 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb index dedf5ee..3d70263 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 66fb336..4d8b7e6 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 9cc2921..1c91e86 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 66fb336..4d8b7e6 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 9cc2921..1c91e86 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 86f377d..525fcb2 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 c7e21c7..74b1810 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.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index 86f377d..525fcb2 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 c7e21c7..74b1810 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/LoginPage.xaml b/shangjian/XGL/LoginPage.xaml index e410876..24c0945 100644 --- a/shangjian/XGL/LoginPage.xaml +++ b/shangjian/XGL/LoginPage.xaml @@ -6,7 +6,8 @@ mc:Ignorable="d" 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" WindowStartupLocation="CenterScreen" MouseLeftButtonDown="Window_MouseLeftButtonDown" Loaded="Window_Loaded"> + Title="Login" Height="500" Width="350" ResizeMode="NoResize" WindowStyle="None" + WindowStartupLocation="CenterScreen" MouseLeftButtonDown="Window_MouseLeftButtonDown" Loaded="Window_Loaded"> diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs index 7f352d3..cf315a5 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs @@ -1,5 +1,7 @@ using CentralControl.DBDAO; using CommonFunc.Tools; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; @@ -28,7 +30,7 @@ namespace XGL.Views public LanJu_Prepare() { InitializeComponent(); - + } List modelWareHouse = new List(); @@ -52,12 +54,13 @@ namespace XGL.Views //modelWareHouse = new List(); //userDbWareHouse = new DBService(); dt = userDbWareHouse.GetWetPlanInfo(); + if (dt == null) return; foreach (DataRow i in dt.Rows) { wet.id = i["id"].ToString(); wet.workorder_id = i["workorder_id"].ToString(); wet.product_name = i["product_name"].ToString(); - + wet.material_code = i["material_code"].ToString(); wet.plan_time = Convert.ToDateTime(i["plan_time"].ToString()); wet.bucket_code = i["bucket_code"].ToString(); @@ -84,7 +87,7 @@ namespace XGL.Views { var selectedRow = WorkOrder.SelectedItem as WorkOrder; var workordercode = selectedRow.WorkOrderCode; - + } private void UserControl_Loaded(object sender, RoutedEventArgs e) @@ -93,45 +96,95 @@ namespace XGL.Views } private void btnStartOrders_Click(object sender, RoutedEventArgs e) { + + if (WorkOrder.SelectedItems.Count == 0) { CustomMessageBox.Show("请选择要开始的工单！", CustomMessageBoxIcon.Warning); return; } string orderID = (WorkOrder.SelectedItem as WetMaterialModel).id; + string material = (WorkOrder.SelectedItem as WetMaterialModel).material_code; + //获取WMS齐套率 var wmsState = userDbWareHouse.GetWorkOrderQitaoLv(orderID); if (wmsState == null || wmsState.Rows[0][0].Equals("0")) { CustomMessageBox.Show("该工单未准备好，请稍后再试！", CustomMessageBoxIcon.Warning); return; } + //获取湿料计划指定的成型机 + var cxjDt = userDbWareHouse.GetCXJList(orderID); + if (cxjDt == null || cxjDt.Rows.Count == 0) + { + CustomMessageBox.Show("该工单未指定成型机，请稍后再试！", CustomMessageBoxIcon.Warning); + return; + } + + List cxjList = new List(); + List bucketList = new List(); + //这扯淡的设计，根据湿料计划获取各个工单对应的工序、机台信息， + for (int i = 0; i < cxjDt.Rows.Count; i++) + { + string jsonStrCXJList = cxjDt.Rows[i][0].ToString(); + string bucketNo = cxjDt.Rows[i][1].ToString(); + bucketList.Add(bucketNo); + // 解析JSON字符串为嵌套的列表结构 + List> data = JsonConvert.DeserializeObject>>(jsonStrCXJList); + + + // 输出嵌套列表的值 + foreach (var innerList in data) + { + if (innerList[0].Equals("GX01")) + { + if (innerList[1].Contains("C")) + { + //记录成型机列表 + cxjList.Add(innerList[1]); + } + } + } + } + cxjList = cxjList.Distinct().ToList();//去重 + + //var jsonObject = JsonConvert.DeserializeObject(jsonStrCXJList); string apiUrl = "http://example.com/api/endpoint"; - string jsonContent = "{\"key1\":\"value1\",\"key2\":\"value2\"}"; + MaterialPlanModel materialPlanModel = new MaterialPlanModel(); skuInfo sku = new skuInfo(); List listWetMaterial = Utils.ToDataList(dt); List unloadNoInfoList = new List(); - //根据湿料计划、成型机分组 - var listChengXingji = listWetMaterial.GroupBy(a => new { a.id,a.prod_line_code}); + List skuInfoList = new List(); - var list = listWetMaterial.GroupBy(a=>a.prod_line_code); - foreach (var item in listChengXingji) - { - unloadNoInfo unloadNoInfo = new unloadNoInfo(); - unloadNoInfo.unloadNo = (WorkOrder.SelectedItem as WetMaterialModel).bucket_code; - unloadNoInfoList.Add(unloadNoInfo); - } - materialPlanModel.reqCode = CommonFunc.Common.GetUUID(); materialPlanModel.reqTime = DateTime.Now.ToString(); materialPlanModel.planNo = orderID; - sku.sku = ""; - sku.loadNo = ""; + + foreach (var item in cxjList) + { + sku.sku = material; + sku.loadNo = item; + unloadNoInfo unloadNoInfo = new unloadNoInfo(); + + foreach (var buckt in bucketList) + { + unloadNoInfo.unloadNo = buckt; + unloadNoInfoList.Add(unloadNoInfo); + } + sku.unLoadItems = unloadNoInfoList; + skuInfoList.Add(sku); + } + + materialPlanModel.data = skuInfoList; + + // 将要发送的数据序列化为JSON格式 + var jsonContent = JsonConvert.SerializeObject(materialPlanModel); + RestHelper restClient = new RestHelper(); - var response = restClient.PostAsync(apiUrl, jsonContent); + var response = restClient.PostAsync(apiUrl, jsonContent); Console.WriteLine(response); } diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj index 39a3bfe..e5741ff 100644 --- a/shangjian/XGL/XGL.csproj +++ b/shangjian/XGL/XGL.csproj @@ -108,6 +108,10 @@ ..\packages\MySql.Data.6.8.8\lib\net40\MySql.Data.dll + + False + ..\Libs\Newtonsoft.Json.dll + ..\..\..\海尔中一悬挂链\前台\XGL\bin\x86\Debug\NLog.dll diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.exe b/shangjian/XGL/bin/x86/Debug/CentralControl.exe index 111e9b2..846b5b3 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.exe and b/shangjian/XGL/bin/x86/Debug/CentralControl.exe differ diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb index 521cb9c..2151828 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb and b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll index 4978f04..1b413f7 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb index 84f3206..8f7c928 100644 Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll index 5300a00..8b53b41 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb index dedf5ee..3d70263 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll index 66fb336..4d8b7e6 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb index 9cc2921..1c91e86 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll index 86f377d..525fcb2 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb index c7e21c7..74b1810 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe b/shangjian/XGL/bin/x86/Debug/XGL.exe index 0c81b8c..30a86c6 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.exe and b/shangjian/XGL/bin/x86/Debug/XGL.exe differ diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb index 92fb5bf..b93e8f5 100644 Binary files a/shangjian/XGL/bin/x86/Debug/XGL.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.pdb differ diff --git a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d980c61..7c876fd 100644 Binary files a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.baml b/shangjian/XGL/obj/x86/Debug/LoginPage.baml index c3a7d1f..6d46c0c 100644 Binary files a/shangjian/XGL/obj/x86/Debug/LoginPage.baml and b/shangjian/XGL/obj/x86/Debug/LoginPage.baml differ diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs b/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs index 127a288..b5b8039 100644 --- a/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs +++ b/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E1E2B77B64905595950267B326E43AFC69E8ABE897825376C0C09897F849D97" +#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F8ECB723432748A6F9BD594B756C48D7681FBD6EC9DA90326450A8EC5714428F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -44,7 +44,7 @@ namespace XGL { public partial class LoginPage : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 34 "..\..\..\LoginPage.xaml" + #line 35 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox username; @@ -52,7 +52,7 @@ namespace XGL { #line hidden - #line 35 "..\..\..\LoginPage.xaml" + #line 36 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.PasswordBox userpwd; @@ -60,7 +60,7 @@ namespace XGL { #line hidden - #line 38 "..\..\..\LoginPage.xaml" + #line 39 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnlogin; @@ -68,7 +68,7 @@ namespace XGL { #line hidden - #line 39 "..\..\..\LoginPage.xaml" + #line 40 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnloginout; @@ -76,7 +76,7 @@ namespace XGL { #line hidden - #line 40 "..\..\..\LoginPage.xaml" + #line 41 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox rememberpwd; @@ -84,7 +84,7 @@ namespace XGL { #line hidden - #line 44 "..\..\..\LoginPage.xaml" + #line 45 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal LoadingIndicators.WPF.LoadingIndicator dldh; @@ -92,7 +92,7 @@ namespace XGL { #line hidden - #line 46 "..\..\..\LoginPage.xaml" + #line 47 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label zzdl; @@ -131,13 +131,13 @@ namespace XGL { { case 1: - #line 9 "..\..\..\LoginPage.xaml" + #line 10 "..\..\..\LoginPage.xaml" ((XGL.LoginPage)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Window_MouseLeftButtonDown); #line default #line hidden - #line 9 "..\..\..\LoginPage.xaml" + #line 10 "..\..\..\LoginPage.xaml" ((XGL.LoginPage)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded); #line default @@ -152,7 +152,7 @@ namespace XGL { case 4: this.btnlogin = ((System.Windows.Controls.Button)(target)); - #line 38 "..\..\..\LoginPage.xaml" + #line 39 "..\..\..\LoginPage.xaml" this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click); #line default @@ -161,7 +161,7 @@ namespace XGL { case 5: this.btnloginout = ((System.Windows.Controls.Button)(target)); - #line 39 "..\..\..\LoginPage.xaml" + #line 40 "..\..\..\LoginPage.xaml" this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click); #line default diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs b/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs index 127a288..b5b8039 100644 --- a/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E1E2B77B64905595950267B326E43AFC69E8ABE897825376C0C09897F849D97" +#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F8ECB723432748A6F9BD594B756C48D7681FBD6EC9DA90326450A8EC5714428F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -44,7 +44,7 @@ namespace XGL { public partial class LoginPage : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 34 "..\..\..\LoginPage.xaml" + #line 35 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox username; @@ -52,7 +52,7 @@ namespace XGL { #line hidden - #line 35 "..\..\..\LoginPage.xaml" + #line 36 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.PasswordBox userpwd; @@ -60,7 +60,7 @@ namespace XGL { #line hidden - #line 38 "..\..\..\LoginPage.xaml" + #line 39 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnlogin; @@ -68,7 +68,7 @@ namespace XGL { #line hidden - #line 39 "..\..\..\LoginPage.xaml" + #line 40 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnloginout; @@ -76,7 +76,7 @@ namespace XGL { #line hidden - #line 40 "..\..\..\LoginPage.xaml" + #line 41 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox rememberpwd; @@ -84,7 +84,7 @@ namespace XGL { #line hidden - #line 44 "..\..\..\LoginPage.xaml" + #line 45 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal LoadingIndicators.WPF.LoadingIndicator dldh; @@ -92,7 +92,7 @@ namespace XGL { #line hidden - #line 46 "..\..\..\LoginPage.xaml" + #line 47 "..\..\..\LoginPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label zzdl; @@ -131,13 +131,13 @@ namespace XGL { { case 1: - #line 9 "..\..\..\LoginPage.xaml" + #line 10 "..\..\..\LoginPage.xaml" ((XGL.LoginPage)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Window_MouseLeftButtonDown); #line default #line hidden - #line 9 "..\..\..\LoginPage.xaml" + #line 10 "..\..\..\LoginPage.xaml" ((XGL.LoginPage)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded); #line default @@ -152,7 +152,7 @@ namespace XGL { case 4: this.btnlogin = ((System.Windows.Controls.Button)(target)); - #line 38 "..\..\..\LoginPage.xaml" + #line 39 "..\..\..\LoginPage.xaml" this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click); #line default @@ -161,7 +161,7 @@ namespace XGL { case 5: this.btnloginout = ((System.Windows.Controls.Button)(target)); - #line 39 "..\..\..\LoginPage.xaml" + #line 40 "..\..\..\LoginPage.xaml" this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click); #line default diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache index 4b71a40..3766b68 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache and b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache index e562f0f..a922dbc 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -336a1031a431b298c9849a32790120e2decadf30 +c46f062259870ea908138b425336cbfba95eceba diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe index 0c81b8c..30a86c6 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.exe and b/shangjian/XGL/obj/x86/Debug/XGL.exe differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.g.resources b/shangjian/XGL/obj/x86/Debug/XGL.g.resources index 6b29902..d898121 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.g.resources and b/shangjian/XGL/obj/x86/Debug/XGL.g.resources differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.pdb b/shangjian/XGL/obj/x86/Debug/XGL.pdb index 92fb5bf..b93e8f5 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache index 0a7fb37..cf3f0c8 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache @@ -12,9 +12,9 @@ DEBUG;TRACE D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml 51-449314787 3-297253631 -63-816002294 -50-505907109 +62596019463 +511587517384 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; -True +False diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache index 9d67310..e16c079 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache @@ -13,8 +13,8 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml 51-449314787 3-297253631 63-816002294 -50-505907109 +511587517384 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; -False +True