diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index bfcbf95..2b02b45 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 58ddff2..014f127 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 ea17aa9..f4a2b29 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 b7f4da1..fbb67a7 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 0737392..359ee5e 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 3948edb..71ba813 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 9f1e88e..baf1af8 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 fed71e9..2da6265 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 b38f156..6a87e1d 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/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
index 9cef4b2..6874aa1 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 58ddff2..014f127 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 ea17aa9..f4a2b29 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ
diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll
index b7f4da1..fbb67a7 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 0737392..359ee5e 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 fed71e9..2da6265 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 b38f156..6a87e1d 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
deleted file mode 100644
index 86f494c..0000000
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll
deleted file mode 100644
index b7f4da1..0000000
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and /dev/null differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb
deleted file mode 100644
index 0737392..0000000
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and /dev/null differ
diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll
index b7f4da1..fbb67a7 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 0737392..359ee5e 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 fed71e9..2da6265 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 b38f156..6a87e1d 100644
Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ
diff --git a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bb68a74..a1434b8 100644
Binary files a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache
index 078b748..9564caa 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/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs
index 9ac0380..a201b76 100644
--- a/shangjian/XGL.Data/DBService/FormingMachineService.cs
+++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs
@@ -71,7 +71,7 @@ namespace XGL.Data.DBService
 	ord.status ,
 	ord.route_code,
 	ord.attr1,
-	ord.shift_id ,totalCount
+	ord.shift_id ,totalCount,shift.Shift_Desc
 FROM
 pro_order_workorder ord
 	LEFT JOIN mes_material_transfer_result res ON res.OrderCode = ord.workorder_id
@@ -81,6 +81,7 @@ pro_order_workorder ord
 		where CONVERT(VARCHAR(10), update_time , 120) = CONVERT(VARCHAR(10),'{workDate}', 120) and equipmentCode = '{devicecode}' group by OrderCode) tt 
 on (tt.ordercode = wet.workorder_id )
 	AND rfid.rfid = res.rfid 
+LEFT JOIN base_shifts_t shift on ord.shift_id = shift.Shift_Id
 WHERE
  CONVERT(VARCHAR(10), wet.plan_time , 120) = CONVERT(VARCHAR(10), '{workDate}', 120 ) 
  And ord.prod_line_code like '%{devicecode}%' and totalCount is not null
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll
deleted file mode 100644
index b7f4da1..0000000
Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and /dev/null differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb
deleted file mode 100644
index 0737392..0000000
Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and /dev/null differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
deleted file mode 100644
index 3948edb..0000000
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and /dev/null differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb
deleted file mode 100644
index 9f1e88e..0000000
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and /dev/null differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll
deleted file mode 100644
index fed71e9..0000000
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and /dev/null differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb
deleted file mode 100644
index b38f156..0000000
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and /dev/null 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 1f5323f..0276568 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 3948edb..71ba813 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 9f1e88e..baf1af8 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/Model/FoamingMac/FoamingMacModel.cs b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs
index d75b9d0..cfe9873 100644
--- a/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs
+++ b/shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs
@@ -33,5 +33,6 @@ namespace XGL.Models.Model.FoamingMac
 
         public string totalCount { get; set; }
         public string isbai { get; set;}
+        public string shift_id { get; set; }
     }
 }
diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll
index fed71e9..2da6265 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 b38f156..6a87e1d 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.csproj.CoreCompileInputs.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
index 6f41dd5..0e719bc 100644
--- a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
+++ b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-844c0ef1f2f89696d27a3bdb6fa05c91340e7be4
+d1055f6dba7da3fb6ce1b69e8b821137771bba54
diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll
index fed71e9..2da6265 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 b38f156..6a87e1d 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/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml
index afc4209..1ae122e 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml
@@ -308,6 +308,7 @@
                 <Setter.Value>
                     <!--ComBoxItem #59CA4F #81D779-->
                     <Style TargetType="ComboBoxItem">
+                        <Setter Property="Height" Value="60"></Setter>
                         <Setter Property="MinHeight" Value="22"></Setter>
                         <Setter Property="MinWidth" Value="60"></Setter>
                         <Setter Property="Template">
@@ -362,7 +363,41 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <Style TargetType="Label">
+            <Setter Property="Height" Value="60"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="24"/>
+        </Style>
+        <Style TargetType="GroupBox">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="GroupBox">
+                        <Grid>
+                            <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="4" Margin="8">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
 
+                                    <!-- 标题部分 -->
+                                    <TextBlock Text="{TemplateBinding Header}" Margin="8,0,0,0" FontWeight="Bold"/>
+
+                                    <!-- 内容部分带滚动条 -->
+                                    <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" PreviewMouseWheel ="ScrollViewer_PreviewMouseWheel">
+                                        <ContentPresenter ContentSource="Content"/>
+                                    </ScrollViewer>
+                                </Grid>
+                            </Border>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        
+        
+        
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -377,12 +412,12 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
                 <Label Content="当前温度：" VerticalContentAlignment="Center" FontSize="16"/>
-                <Label x:Name="lbCurrTemperature" Width="60" VerticalContentAlignment="Center" FontSize="17" 
+                <Label x:Name="lbCurrTemperature" 
                             Foreground="#1A68CA"></Label>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <Label Content="当前湿度：" VerticalContentAlignment="Center" FontSize="16"/>
-                <Label x:Name="lbCurrHumilly" Width="60" VerticalContentAlignment="Center"  FontSize="17" 
+                <Label x:Name="lbCurrHumilly"  
                             Foreground="#1A68CA"></Label>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
@@ -423,16 +458,14 @@
             </StackPanel> 
         </StackPanel>
         <!--ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"-->
-        <GroupBox  Grid.Row="1"  HorizontalContentAlignment="Center">
-            <GroupBox.Header>
-                <Label Content="烘房外" FontSize="18"/>
-            </GroupBox.Header>
+        <GroupBox  Grid.Row="1"  HorizontalContentAlignment="Center" Header="烘房外" Margin="5">
+            <!--<GroupBox.Header>
+                <Label Content="烘房外" FontSize="18" HorizontalContentAlignment="Left" HorizontalAlignment="Left"/>
+            </GroupBox.Header>-->
             <ListBox  x:Name="DringRoomOuterListBox"  Style="{DynamicResource ApplicantList_ListBox_Style}" ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"   Margin="20,0,0,0"></ListBox>
         </GroupBox>
-        <GroupBox Grid.Row="2">
-            <GroupBox.Header>
-                <Label Content="烘房内" FontSize="18"/>
-            </GroupBox.Header>
+        <GroupBox Grid.Row="2" Header="烘房内" Margin="5">
+
             <ListBox Grid.Row="2" x:Name="DringRoomListBox" Style="{DynamicResource ApplicantList_ListBox_Style}" ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"  Margin="20,0,0,0">
             </ListBox>
         </GroupBox>
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml.cs b/shangjian/XGL/Views/DryingRoomUC.xaml.cs
index 197acd1..6df15d7 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml.cs
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml.cs
@@ -244,6 +244,23 @@ namespace XGL.Views
             ViewPlcInfoWin viewPlcWin = new ViewPlcInfoWin();
             viewPlcWin.ShowDialog();
         }
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            ScrollViewer scrollViewer = sender as ScrollViewer;
+            if (scrollViewer != null)
+            {
+                if (e.Delta > 0)
+                {
+                    scrollViewer.LineUp();
+                }
+                else
+                {
+                    scrollViewer.LineDown();
+                }
+                e.Handled = true;
+            }
+        }
     }
     public class EquipmentMode
     {
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml
index 44f8cfa..1e0fe35 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml
@@ -409,7 +409,7 @@
                     HeadersVisibility="Column"
                     CellStyle="{StaticResource CustomCellStyle}"
                     HorizontalAlignment="Left"
-                    VerticalAlignment="Top" IsReadOnly="True"
+                    VerticalAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True"
                     AutoGenerateColumns="False" CanUserAddRows="False" SelectionChanged="dgWorkOrderInfo_SelectionChanged">
             <DataGrid.ColumnHeaderStyle  >
                 <Style TargetType="DataGridColumnHeader">
@@ -444,7 +444,7 @@
                 </DataGridTextColumn>
                 <DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
                 <DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />
-                <DataGridTextColumn Width="180" Header="班次" Binding="{Binding isbai}" />
+                <DataGridTextColumn Width="180" Header="班次" Binding="{Binding shift_id}" />
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
                
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index 86df945..6d93b41 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -193,16 +193,16 @@ namespace XGL.Views
                     order.status = i["status"].ToString();
                     order.process_id = i["route_code"].ToString();
                     order.attr1 = i["attr1"].ToString();
-                    isbaiye= i["shift_id"].ToString();
+                    order.shift_id = i["Shift_Desc"].ToString();
                     order.totalCount = i["totalCount"].ToString();
-                    if (isbaiye=="5")
-                    {
-                        order.isbai = "白班";
-                    }
-                    else if (isbaiye=="2")
-                    {
-                        order.isbai = "夜班";
-                    }
+                    //if (isbaiye=="5")
+                    //{
+                    //    order.isbai = "白班";
+                    //}
+                    //else if (isbaiye=="2")
+                    //{
+                    //    order.isbai = "夜班";
+                    //}
                     orderList.Add(order);
 
                 }
@@ -323,6 +323,7 @@ namespace XGL.Views
                     order.process_id = i["route_code"].ToString();
                     order.attr1 = i["attr1"].ToString();
                     order.totalCount = i["totalCount"].ToString();
+                    order.shift_id = i["Shift_Desc"].ToString();
                     orderList.Add(order);
 
                 }
diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj
index 140a86e..f8bdfa6 100644
--- a/shangjian/XGL/XGL.csproj
+++ b/shangjian/XGL/XGL.csproj
@@ -339,6 +339,9 @@
     <Compile Include="Views\DryingRoomUC.xaml.cs">
       <DependentUpon>DryingRoomUC.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\HBLogWin.xaml.cs">
+      <DependentUpon>HBLogWin.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ShouPeiWin.xaml.cs">
       <DependentUpon>ShouPeiWin.xaml</DependentUpon>
     </Compile>
@@ -574,6 +577,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\HBLogWin.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\ShouPeiWin.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/shangjian/XGL/XGL.csproj.user b/shangjian/XGL/XGL.csproj.user
index f464c48..a82707a 100644
--- a/shangjian/XGL/XGL.csproj.user
+++ b/shangjian/XGL/XGL.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <PublishUrlHistory />
     <InstallUrlHistory />
     <SupportUrlHistory />
diff --git a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index c65238f..0000000
--- a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
deleted file mode 100644
index d6b5944..0000000
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "78352914B9142AAC31B7370C1E4947E13871C6386E9E928CF46E67383F325ED7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-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.Forms.Integration;
-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;
-using XGL.Tools;
-
-
-namespace XGL.Views {
-    
-    
-    /// <summary>
-    /// LanJu_Operator
-    /// </summary>
-    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 217 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnPause;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 238 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnRecover;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 325 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnRefresh;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 344 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnCheckLog;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 364 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnViewPlcvalue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 383 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button HFPlcvalue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 537 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ContentControl Window1;
-        
-        #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) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/XGL;component/views/lanju_operator.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\Views\LanJu_Operator.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:
-            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 218 "..\..\..\..\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 244 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 265 "..\..\..\..\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 286 "..\..\..\..\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 308 "..\..\..\..\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 336 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 8:
-            this.btnCheckLog = ((System.Windows.Controls.Button)(target));
-            
-            #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnCheckLog.Click += new System.Windows.RoutedEventHandler(this.btnCheckLog_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 9:
-            this.btnViewPlcvalue = ((System.Windows.Controls.Button)(target));
-            
-            #line 375 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnViewPlcvalue.Click += new System.Windows.RoutedEventHandler(this.btnViewPlcvalue_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 10:
-            this.HFPlcvalue = ((System.Windows.Controls.Button)(target));
-            
-            #line 394 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.HFPlcvalue.Click += new System.Windows.RoutedEventHandler(this.HFPlcvalue_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 11:
-            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
-            
-            #line 408 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
-            
-            #line default
-            #line hidden
-            
-            #line 413 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 12:
-            
-            #line 469 "..\..\..\..\Views\LanJu_Operator.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 13:
-            this.Window1 = ((System.Windows.Controls.ContentControl)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
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
deleted file mode 100644
index d6b5944..0000000
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "78352914B9142AAC31B7370C1E4947E13871C6386E9E928CF46E67383F325ED7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-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.Forms.Integration;
-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;
-using XGL.Tools;
-
-
-namespace XGL.Views {
-    
-    
-    /// <summary>
-    /// LanJu_Operator
-    /// </summary>
-    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 217 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnPause;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 238 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnRecover;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 325 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnRefresh;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 344 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnCheckLog;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 364 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnViewPlcvalue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 383 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button HFPlcvalue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 397 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 537 "..\..\..\..\Views\LanJu_Operator.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ContentControl Window1;
-        
-        #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) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/XGL;component/views/lanju_operator.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\Views\LanJu_Operator.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:
-            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 218 "..\..\..\..\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 244 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 265 "..\..\..\..\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 286 "..\..\..\..\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 308 "..\..\..\..\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 336 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 8:
-            this.btnCheckLog = ((System.Windows.Controls.Button)(target));
-            
-            #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnCheckLog.Click += new System.Windows.RoutedEventHandler(this.btnCheckLog_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 9:
-            this.btnViewPlcvalue = ((System.Windows.Controls.Button)(target));
-            
-            #line 375 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.btnViewPlcvalue.Click += new System.Windows.RoutedEventHandler(this.btnViewPlcvalue_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 10:
-            this.HFPlcvalue = ((System.Windows.Controls.Button)(target));
-            
-            #line 394 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.HFPlcvalue.Click += new System.Windows.RoutedEventHandler(this.HFPlcvalue_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 11:
-            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
-            
-            #line 408 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
-            
-            #line default
-            #line hidden
-            
-            #line 413 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.dgWorkOrderInfo_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 12:
-            
-            #line 469 "..\..\..\..\Views\LanJu_Operator.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 13:
-            this.Window1 = ((System.Windows.Controls.ContentControl)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
deleted file mode 100644
index 399bf47..0000000
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 023fa00..0000000
--- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-250edbe86bd9fc61c7403458558dd8bdd7360fde
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
deleted file mode 100644
index a37a9e7..0000000
--- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,312 +0,0 @@
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\nitsos.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Config\log4net.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\snap7.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\config\ConnectionConfig.Config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\NLog.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\newMessage.wav
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\libmupdf.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\bg.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\car.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\Background.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\gd.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\vgd.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\xjline.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\xjl.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\HLine.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\VLine.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\VLineUp.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\HLineS.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\lanjuLogoNew.ico
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_01.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_02.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_03.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_04.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_05.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_06.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_07.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_08.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_09.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_10.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_11.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_12.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_13.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_14.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_15.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_16.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_17.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_18.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_19.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_20.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_21.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_22.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_23.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_24.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_25.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_26.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_1.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_2.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_3.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_4.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_5.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_6.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_7.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_2_8.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\btnBg.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\zwtpp.jpg
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\BtnInsert.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\BtnSelect.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_03.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_05.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_07.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_09.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_11.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_13.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_15.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_17.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_19.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_21.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_33.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_34.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_35.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_36.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_37.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_38.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_39.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_40.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_41.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\icon_3_42.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\close.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\green.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\red.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\NG-Dlight.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\NG-Llight.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\OK-Dlight.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\OK-Llight.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\hand.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\HandCtrl.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\Empty.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\takeoff.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\xj.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\Boardbg.png
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.exe.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.exe
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\CentralControl.exe
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\CommonFunc.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Google.Protobuf.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\HandyControl.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ICSharpCode.SharpZipLib.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LanJu.exe
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LiveCharts.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LoadingIndicators.WPF.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\log4net.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\MaterialDesignColors.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\MaterialDesignThemes.Wpf.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Microsoft.Xaml.Behaviors.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\MySql.Data.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Newtonsoft.Json.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\NLog.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\PdfiumViewer.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\PdfSharpCore.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\SixLabors.Fonts.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\SixLabors.ImageSharp.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Buffers.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Memory.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Numerics.Vectors.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Runtime.Serialization.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Windows.Interactivity.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Telerik.Windows.Controls.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Thrift.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\WpfCustomControlLibrary1.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\WPFupdate.exe
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Xceed.Wpf.AvalonDock.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Xceed.Wpf.DataGrid.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Xceed.Wpf.Toolkit.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Data.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Models.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Thrift.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ZCustomControl.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\HtmlAgilityPack.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\NPOI.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\QRCoder.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\NPOI.OOXML.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\BCrypt.Net-Next.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\NPOI.OpenXmlFormats.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\NPOI.OpenXml4Net.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\CentralControl.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\CentralControl.exe.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LanJu.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LanJu.exe.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\WPFupdate.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\WPFupdate.exe.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Models.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Models.dll.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Thrift.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\CommonFunc.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\CommonFunc.dll.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Data.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\XGL.Data.dll.config
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Google.Protobuf.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\HandyControl.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\HandyControl.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ICSharpCode.SharpZipLib.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ICSharpCode.SharpZipLib.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LiveCharts.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\LiveCharts.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\MaterialDesignColors.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\MaterialDesignThemes.Wpf.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\MaterialDesignThemes.Wpf.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Microsoft.Xaml.Behaviors.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\PdfiumViewer.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\SixLabors.Fonts.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\SixLabors.ImageSharp.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Buffers.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Memory.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Numerics.Vectors.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\HtmlAgilityPack.pdb
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\HtmlAgilityPack.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\BCrypt.Net-Next.xml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\nl\PdfiumViewer.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\de\PdfSharpCore.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.AssemblyReference.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.SuggestedBindingRedirects.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\CSS\DataGridClass.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\CSS\NormalSmlBtnClass.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\CSS\SearchBtnClass.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\CSS\Style.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\CSS\SearchTextClass.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\CSS\TabControl.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\LoginPage.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\MainWindow.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormBlankingBoard.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormBoard.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormChargingBoard.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormLocator.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormOutBoxBoard.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormShowSelect.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\Main.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\LoginPage.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\MainWindow.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Tools\ModuleUC.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\ordertj.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\orderzfzy.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\orderzy.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_order.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_ordertj.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_orderzfzy.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_orderzy.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCArea.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCBoard.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCCar.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCCarL.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCLMix.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCMix.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCMixR.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCPermissionList.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCPostionList.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCProgressBar.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCRoleList.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCRProgressBar.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCStorage.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCStorageNew.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCStorageNewx.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCTakeOff.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCUserList.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\CheckUserWin.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\DryingRoomUC.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ShouPeiWin.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\SopInfoWin.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\FlowInfoWin.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Complete.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_DeviceItems.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Flow.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Index.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_InOut.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Material.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_NowUser.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Operator.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Paused.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Prepare.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_User.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_UserRecord.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewPlcInfoWin.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewLogWin.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\App.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL_Content.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL_MarkupCompile.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL_MarkupCompile.lref
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormBlankingBoard.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormBoard.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormChargingBoard.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormLocator.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormOutBoxBoard.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\FormShowSelect.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\FormItem\Main.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Tools\ModuleUC.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\ordertj.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\orderzfzy.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\orderzy.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_order.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_ordertj.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_orderzfzy.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\product_orderzy.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCArea.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCBoard.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCCar.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCCarL.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCLMix.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCMix.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCMixR.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCPermissionList.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCPostionList.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCProgressBar.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCRoleList.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCRProgressBar.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCStorage.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCStorageNew.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCStorageNewx.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCTakeOff.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\UControl\UCUserList.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\CheckUserWin.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\DryingRoomUC.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ShouPeiWin.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\SopInfoWin.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\FlowInfoWin.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Complete.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_DeviceItems.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Flow.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Index.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_InOut.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Material.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_NowUser.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Operator.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Paused.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_Prepare.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_User.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\LanJu_UserRecord.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewPlcInfoWin.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewLogWin.baml
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.g.resources
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.Properties.Resources.resources
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.GenerateResource.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CoreCompileInputs.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CopyComplete
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.exe
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\XGL.pdb
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
deleted file mode 100644
index e57135f..0000000
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.exe and /dev/null differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.g.resources b/shangjian/XGL/obj/x86/Debug/XGL.g.resources
deleted file mode 100644
index ebcc7db..0000000
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.g.resources and /dev/null differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.pdb b/shangjian/XGL/obj/x86/Debug/XGL.pdb
deleted file mode 100644
index 5598625..0000000
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and /dev/null differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
deleted file mode 100644
index 256d8fb..0000000
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
+++ /dev/null
@@ -1,20 +0,0 @@
-XGL
-
-
-winexe
-C#
-.cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\
-XGL
-none
-false
-DEBUG;TRACE
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
-591234386457
-4-78973161
-79-1358286590
-170379361014
-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;Tools\ModuleUC.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\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.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;Views\ViewPlcInfoWin.xaml;Views\ViewLogWin.xaml;
-
-False
-
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
deleted file mode 100644
index 75d1333..0000000
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
+++ /dev/null
@@ -1,54 +0,0 @@
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
-
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormChargingBoard.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormLocator.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormOutBoxBoard.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormShowSelect.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\Main.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Tools\ModuleUC.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\ordertj.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzfzy.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzy.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_order.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_ordertj.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzfzy.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzy.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCArea.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCBoard.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCar.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCarL.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCLMix.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMix.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMixR.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPermissionList.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPostionList.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCProgressBar.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRoleList.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRProgressBar.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorage.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNew.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNewx.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCTakeOff.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCUserList.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\CheckUserWin.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\DryingRoomUC.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\ShouPeiWin.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\SopInfoWin.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\FlowInfoWin.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Complete.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_DeviceItems.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Flow.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Index.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_InOut.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Material.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_NowUser.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Operator.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Paused.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Prepare.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_User.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_UserRecord.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\ViewPlcInfoWin.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\ViewLogWin.xaml;;
-