diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index 3f8555b..41c4fc5 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index e74510f..7da01e9 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C6" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-		<add key="ClientMode" value="1" />
+		<add key="ClientMode" value="0" />
 		<add key="DryingHouseList" value="H1,H2,H3" />
 		<!--上位机类型 1 上件 ，2 排空区  0下件区-->
 		<add key="PostType" value="1" />
diff --git a/shangjian/XGL/LoginPage.xaml b/shangjian/XGL/LoginPage.xaml
index 81f16ff..2fc5c64 100644
--- a/shangjian/XGL/LoginPage.xaml
+++ b/shangjian/XGL/LoginPage.xaml
@@ -22,7 +22,7 @@
         <!--<Image Source="Images/home.png" Width="100" Height="100" VerticalAlignment="Top" Margin="20"></Image>-->
         <Label Foreground="White" FontSize="30"  HorizontalAlignment="Center" VerticalAlignment="Top"  Margin="0,10,0,0">
             <Label.Content>
-                <Image Source="/Resources/logo.png" Width="160" Height="50"/> 
+                <Image Source="/Resources/logo.png" Width="160" Height="50"/>
             </Label.Content>
         </Label>
         <Rectangle Width="280" Height="240" Fill="White" VerticalAlignment="Bottom" Margin="0,100" RadiusY="19.112" RadiusX="19.112">
@@ -36,18 +36,21 @@
                 <TextBox x:Name="username" materialDesign:HintAssist.Hint="账号"   Margin="0,10" FontFamily="Champagne &amp; Limousines" FontSize="18"></TextBox>
                 <PasswordBox x:Name="userpwd" materialDesign:HintAssist.Hint="密码"  Margin="0,10" FontFamily="Champagne &amp; Limousines" FontSize="18"></PasswordBox>
             </StackPanel>
+         
+            <Button x:Name="btnCheckUpdate" Content="检查更新" Background="#0000" BorderThickness="0" RenderTransformOrigin="0.62,7.171" Margin="194,190,20,20" Foreground="Blue" Click="btnCheckUpdate_Click"/>
         </Grid>
         <Button VerticalAlignment="Bottom" Background="#0454D7" IsDefault="True" BorderBrush="Transparent" x:Name="btnlogin" Margin="68,0,182,85" Width="100" Height="30" Content="登录" Click="btnlogin_Click"></Button>
         <Button VerticalAlignment="Bottom"    Background="#D7D7D7" Foreground="Black" BorderBrush="Transparent"  x:Name="btnloginout"  Margin="192,0,58,85" Width="100" Height="30" Content="退出" Click="btnloginout_Click" ></Button>
-        <CheckBox x:Name="rememberpwd" VerticalAlignment="Bottom" Background="#F6FBD9" Margin="48,0,0,126"
+        <CheckBox x:Name="rememberpwd" VerticalAlignment="Bottom" Background="#F6FBD9" Margin="48,0,0,126" Width="100" HorizontalAlignment="Left"
                 IsChecked="True">
             记住密码
         </CheckBox>
+        <Label Width="100" Height="30" VerticalContentAlignment="Center"/>
         <!--<loadin:LoadingIndicator x:Name="dldh" Margin="156,434,154,26" SpeedRatio="1.5" IsActive="True" Style="{DynamicResource LoadingIndicatorArcsStyle}">
         </loadin:LoadingIndicator>-->
         <customControlLibrary1:CustomControl1 x:Name="dldh" Margin="156,434,154,26" Width="50" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         <Label x:Name="zzdl" HorizontalAlignment="Center" Margin="115,476,100,0" Content="正在登陆" Foreground="#0454D7"></Label>
         <!--<TextBlock Text="ESQUECEU SUA SENHA?" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="50" Foreground="Gray" Cursor="Hand"></TextBlock>-->
-        
+
     </Grid>
 </Window>
diff --git a/shangjian/XGL/LoginPage.xaml.cs b/shangjian/XGL/LoginPage.xaml.cs
index 97b887e..b0bcf6f 100644
--- a/shangjian/XGL/LoginPage.xaml.cs
+++ b/shangjian/XGL/LoginPage.xaml.cs
@@ -234,6 +234,11 @@ namespace XGL
         {
             this.DragMove();//窗体可移动
         }
+
+        private void btnCheckUpdate_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
     public class UserLogin
     {
diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml b/shangjian/XGL/Views/LanJu_InOut.xaml
index 1f1b520..8c13010 100644
--- a/shangjian/XGL/Views/LanJu_InOut.xaml
+++ b/shangjian/XGL/Views/LanJu_InOut.xaml
@@ -25,7 +25,7 @@
             Background="#F2F3F5">
             <Grid
                 Width="1920"
-                Height="350"
+                Height="330"
                 Margin="0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe b/shangjian/XGL/bin/x86/Debug/XGL.exe
index 9751351..082f0fd 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.exe.config b/shangjian/XGL/bin/x86/Debug/XGL.exe.config
index e74510f..7da01e9 100644
--- a/shangjian/XGL/bin/x86/Debug/XGL.exe.config
+++ b/shangjian/XGL/bin/x86/Debug/XGL.exe.config
@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C6" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-		<add key="ClientMode" value="1" />
+		<add key="ClientMode" value="0" />
 		<add key="DryingHouseList" value="H1,H2,H3" />
 		<!--上位机类型 1 上件 ，2 排空区  0下件区-->
 		<add key="PostType" value="1" />
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb
index 9dc8e15..293f3db 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/LoginPage.baml b/shangjian/XGL/obj/x86/Debug/LoginPage.baml
index 76d50ec..c11e1ed 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 3446632..ac3f542 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}" "3A9951444C1DB0B5BA3B58A6798A91E51C4C7B8EEE68E9E2CABC5710A6105FF8"
+#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "087D792274A97C8E8200D9A68CF330BF9CA9325F04D4BD870B7AC53DBC63104A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -64,15 +64,7 @@ namespace XGL {
         
         #line 40 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnlogin;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 41 "..\..\..\LoginPage.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnloginout;
+        internal System.Windows.Controls.Button btnCheckUpdate;
         
         #line default
         #line hidden
@@ -80,13 +72,29 @@ namespace XGL {
         
         #line 42 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnlogin;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 43 "..\..\..\LoginPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnloginout;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 44 "..\..\..\LoginPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox rememberpwd;
         
         #line default
         #line hidden
         
         
-        #line 48 "..\..\..\LoginPage.xaml"
+        #line 51 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal WpfCustomControlLibrary1.CustomControl1 dldh;
         
@@ -94,7 +102,7 @@ namespace XGL {
         #line hidden
         
         
-        #line 49 "..\..\..\LoginPage.xaml"
+        #line 52 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label zzdl;
         
@@ -152,30 +160,39 @@ namespace XGL {
             this.userpwd = ((System.Windows.Controls.PasswordBox)(target));
             return;
             case 4:
-            this.btnlogin = ((System.Windows.Controls.Button)(target));
+            this.btnCheckUpdate = ((System.Windows.Controls.Button)(target));
             
             #line 40 "..\..\..\LoginPage.xaml"
-            this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click);
+            this.btnCheckUpdate.Click += new System.Windows.RoutedEventHandler(this.btnCheckUpdate_Click);
             
             #line default
             #line hidden
             return;
             case 5:
-            this.btnloginout = ((System.Windows.Controls.Button)(target));
+            this.btnlogin = ((System.Windows.Controls.Button)(target));
             
-            #line 41 "..\..\..\LoginPage.xaml"
-            this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click);
+            #line 42 "..\..\..\LoginPage.xaml"
+            this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click);
             
             #line default
             #line hidden
             return;
             case 6:
-            this.rememberpwd = ((System.Windows.Controls.CheckBox)(target));
+            this.btnloginout = ((System.Windows.Controls.Button)(target));
+            
+            #line 43 "..\..\..\LoginPage.xaml"
+            this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click);
+            
+            #line default
+            #line hidden
             return;
             case 7:
-            this.dldh = ((WpfCustomControlLibrary1.CustomControl1)(target));
+            this.rememberpwd = ((System.Windows.Controls.CheckBox)(target));
             return;
             case 8:
+            this.dldh = ((WpfCustomControlLibrary1.CustomControl1)(target));
+            return;
+            case 9:
             this.zzdl = ((System.Windows.Controls.Label)(target));
             return;
             }
diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs b/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs
index 3446632..ac3f542 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}" "3A9951444C1DB0B5BA3B58A6798A91E51C4C7B8EEE68E9E2CABC5710A6105FF8"
+#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "087D792274A97C8E8200D9A68CF330BF9CA9325F04D4BD870B7AC53DBC63104A"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -64,15 +64,7 @@ namespace XGL {
         
         #line 40 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnlogin;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 41 "..\..\..\LoginPage.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnloginout;
+        internal System.Windows.Controls.Button btnCheckUpdate;
         
         #line default
         #line hidden
@@ -80,13 +72,29 @@ namespace XGL {
         
         #line 42 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnlogin;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 43 "..\..\..\LoginPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button btnloginout;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 44 "..\..\..\LoginPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox rememberpwd;
         
         #line default
         #line hidden
         
         
-        #line 48 "..\..\..\LoginPage.xaml"
+        #line 51 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal WpfCustomControlLibrary1.CustomControl1 dldh;
         
@@ -94,7 +102,7 @@ namespace XGL {
         #line hidden
         
         
-        #line 49 "..\..\..\LoginPage.xaml"
+        #line 52 "..\..\..\LoginPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label zzdl;
         
@@ -152,30 +160,39 @@ namespace XGL {
             this.userpwd = ((System.Windows.Controls.PasswordBox)(target));
             return;
             case 4:
-            this.btnlogin = ((System.Windows.Controls.Button)(target));
+            this.btnCheckUpdate = ((System.Windows.Controls.Button)(target));
             
             #line 40 "..\..\..\LoginPage.xaml"
-            this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click);
+            this.btnCheckUpdate.Click += new System.Windows.RoutedEventHandler(this.btnCheckUpdate_Click);
             
             #line default
             #line hidden
             return;
             case 5:
-            this.btnloginout = ((System.Windows.Controls.Button)(target));
+            this.btnlogin = ((System.Windows.Controls.Button)(target));
             
-            #line 41 "..\..\..\LoginPage.xaml"
-            this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click);
+            #line 42 "..\..\..\LoginPage.xaml"
+            this.btnlogin.Click += new System.Windows.RoutedEventHandler(this.btnlogin_Click);
             
             #line default
             #line hidden
             return;
             case 6:
-            this.rememberpwd = ((System.Windows.Controls.CheckBox)(target));
+            this.btnloginout = ((System.Windows.Controls.Button)(target));
+            
+            #line 43 "..\..\..\LoginPage.xaml"
+            this.btnloginout.Click += new System.Windows.RoutedEventHandler(this.btnloginout_Click);
+            
+            #line default
+            #line hidden
             return;
             case 7:
-            this.dldh = ((WpfCustomControlLibrary1.CustomControl1)(target));
+            this.rememberpwd = ((System.Windows.Controls.CheckBox)(target));
             return;
             case 8:
+            this.dldh = ((WpfCustomControlLibrary1.CustomControl1)(target));
+            return;
+            case 9:
             this.zzdl = ((System.Windows.Controls.Label)(target));
             return;
             }
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
index 6f6b90d..156b204 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "900AB4A25FD2778DB6739C87FEB2B0F97BD5FE5DFAAA65B6E4B7D8B96B8B515E"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36537C5A54FBB9BC69E126C97D248A7D89587462E16D4136074C690C18A5A0AC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
index 6f6b90d..156b204 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "900AB4A25FD2778DB6739C87FEB2B0F97BD5FE5DFAAA65B6E4B7D8B96B8B515E"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36537C5A54FBB9BC69E126C97D248A7D89587462E16D4136074C690C18A5A0AC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml
index b5dd74e..bb16e4f 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
index 5166b4a..669a6c0 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
@@ -1,5 +1,4 @@
-// Updated by XamlIntelliSenseFileGenerator 2023-10-8 18:44:15
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "366D02E19597E9666A6D222B5F229768B9DF7CB19E8732060AE011535EA650B5"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C5EBDD54F3BC1368B0F3949337FCB1825696BE8B5BBCE00AE513D6C2844DC6FA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -34,186 +33,175 @@ using System.Windows.Shell;
 using XGL.Tools;
 
 
-namespace XGL.Views
-{
-
-
+namespace XGL.Views {
+    
+    
     /// <summary>
     /// LanJu_Operator
     /// </summary>
-    public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector
-    {
-
-#line default
-#line hidden
-
-
-#line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
+    public partial class LanJu_Operator : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 3 "..\..\..\..\Views\LanJu_Operator.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal XGL.Views.LanJu_Operator UCOperator;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnPause;
-
-#line default
-#line hidden
-
-
-#line 228 "..\..\..\..\Views\LanJu_Operator.xaml"
+        
+        #line default
+        #line hidden
+        
+        
+        #line 228 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnRecover;
-
-#line default
-#line hidden
-
-
-#line 315 "..\..\..\..\Views\LanJu_Operator.xaml"
+        
+        #line default
+        #line hidden
+        
+        
+        #line 315 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnRefresh;
-
-#line default
-#line hidden
-
-
-#line 332 "..\..\..\..\Views\LanJu_Operator.xaml"
+        
+        #line default
+        #line hidden
+        
+        
+        #line 332 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
-
-#line default
-#line hidden
-
-
-#line 468 "..\..\..\..\Views\LanJu_Operator.xaml"
+        
+        #line default
+        #line hidden
+        
+        
+        #line 468 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window1;
-
-#line default
-#line hidden
-
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
-
+        
         /// <summary>
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent()
-        {
-            if (_contentLoaded)
-            {
+        public void InitializeComponent() {
+            if (_contentLoaded) {
                 return;
             }
             _contentLoaded = true;
             System.Uri resourceLocater = new System.Uri("/XGL;component/views/lanju_operator.xaml", System.UriKind.Relative);
-
-#line 1 "..\..\..\..\Views\LanJu_Operator.xaml"
+            
+            #line 1 "..\..\..\..\Views\LanJu_Operator.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);
-
-#line default
-#line hidden
+            
+            #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)
-        {
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-                case 1:
-                    this.UCOperator = ((XGL.Views.LanJu_Operator)(target));
-
-#line 12 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded);
-
-#line default
-#line hidden
-                    return;
-                case 2:
-                    this.btnComplete = ((System.Windows.Controls.Button)(target));
-
-#line 152 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    this.btnComplete.Click += new System.Windows.RoutedEventHandler(this.btnComplete_Click);
-
-#line default
-#line hidden
-                    return;
-                case 3:
-                    this.btnPause = ((System.Windows.Controls.Button)(target));
-
-#line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
-
-#line default
-#line hidden
-                    return;
-                case 4:
-                    this.btnRecover = ((System.Windows.Controls.Button)(target));
-
-#line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
-
-#line default
-#line hidden
-                    return;
-                case 5:
-
-#line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
-
-#line default
-#line hidden
-                    return;
-                case 6:
-
-#line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
-
-#line default
-#line hidden
-                    return;
-                case 7:
-
-#line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-
-#line default
-#line hidden
-                    return;
-                case 8:
-                    this.btnRefresh = ((System.Windows.Controls.Button)(target));
-
-#line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
-
-#line default
-#line hidden
-                    return;
-                case 9:
-                    this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
-
-#line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
-
-#line default
-#line hidden
-                    return;
-                case 10:
-
-#line 400 "..\..\..\..\Views\LanJu_Operator.xaml"
-                    ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
-
-#line default
-#line hidden
-                    return;
-                case 11:
-                    this.Window1 = ((System.Windows.Controls.ContentControl)(target));
-                    return;
+            case 1:
+            this.UCOperator = ((XGL.Views.LanJu_Operator)(target));
+            
+            #line 12 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.UCOperator.Loaded += new System.Windows.RoutedEventHandler(this.UCOperator_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
+            this.btnPause = ((System.Windows.Controls.Button)(target));
+            
+            #line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.btnRecover = ((System.Windows.Controls.Button)(target));
+            
+            #line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            
+            #line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 5:
+            
+            #line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 6:
+            
+            #line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 7:
+            this.btnRefresh = ((System.Windows.Controls.Button)(target));
+            
+            #line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 8:
+            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
+            
+            #line default
+            #line hidden
+            return;
+            case 9:
+            
+            #line 400 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 10:
+            this.Window1 = ((System.Windows.Controls.ContentControl)(target));
+            return;
             }
             this._contentLoaded = true;
         }
-
-        internal System.Windows.Controls.UserControl UCOperator;
     }
 }
 
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
index 97258dc..669a6c0 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "366D02E19597E9666A6D222B5F229768B9DF7CB19E8732060AE011535EA650B5"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C5EBDD54F3BC1368B0F3949337FCB1825696BE8B5BBCE00AE513D6C2844DC6FA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -50,14 +50,6 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 146 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnComplete;
-        
-        #line default
-        #line hidden
-        
-        
         #line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnPause;
@@ -137,15 +129,6 @@ namespace XGL.Views {
             #line hidden
             return;
             case 2:
-            this.btnComplete = ((System.Windows.Controls.Button)(target));
-            
-            #line 152 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnComplete.Click += new System.Windows.RoutedEventHandler(this.btnComplete_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
             this.btnPause = ((System.Windows.Controls.Button)(target));
             
             #line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
@@ -154,7 +137,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 4:
+            case 3:
             this.btnRecover = ((System.Windows.Controls.Button)(target));
             
             #line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
@@ -163,7 +146,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 5:
+            case 4:
             
             #line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
@@ -171,7 +154,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 6:
+            case 5:
             
             #line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
@@ -179,7 +162,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 7:
+            case 6:
             
             #line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
@@ -187,7 +170,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 8:
+            case 7:
             this.btnRefresh = ((System.Windows.Controls.Button)(target));
             
             #line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
@@ -196,7 +179,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 9:
+            case 8:
             this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
             
             #line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
@@ -205,7 +188,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 10:
+            case 9:
             
             #line 400 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
@@ -213,7 +196,7 @@ namespace XGL.Views {
             #line default
             #line hidden
             return;
-            case 11:
+            case 10:
             this.Window1 = ((System.Windows.Controls.ContentControl)(target));
             return;
             }
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
index 9751351..082f0fd 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 71a5cb3..194d833 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 9dc8e15..293f3db 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ