diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index 528000b..d93e590 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest
index 9d44e0f..af8e83c 100644
--- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest
+++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest
@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>Po3RXPWGZu4mUxH1jVsl/Rdx6vzD+7hH//g0gawb1HM=</dsig:DigestValue>
+        <dsig:DigestValue>qnFKF+/3YlPAODyAGRSFG761uj8zOHLBVY6MUaXwrHc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe
index c52b183..b6728a4 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 cf6e98d..a3597ab 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 da275a2..778e21f 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 dfa5eda..6c3a505 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 cff1302..84a85dd 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 1820461..875e1a0 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 acfd5db..8a82c53 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 d332ee5..2d7d616 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 f510f17..5da159c 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 c52b183..b6728a4 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 cf6e98d..a3597ab 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 da275a2..778e21f 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 dfa5eda..6c3a505 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 acfd5db..8a82c53 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 d332ee5..2d7d616 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/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll
index da275a2..778e21f 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 dfa5eda..6c3a505 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 acfd5db..8a82c53 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 d332ee5..2d7d616 100644
Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ
diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache
index a0d1e38..d03db2e 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ
diff --git a/shangjian/WPFupdate/bin/Debug/WPFupdate.exe b/shangjian/WPFupdate/bin/Debug/WPFupdate.exe
index 5877c12..d26f006 100644
Binary files a/shangjian/WPFupdate/bin/Debug/WPFupdate.exe and b/shangjian/WPFupdate/bin/Debug/WPFupdate.exe differ
diff --git a/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb b/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb
index 784c130..26da229 100644
Binary files a/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb and b/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb differ
diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.exe b/shangjian/WPFupdate/obj/Debug/WPFupdate.exe
index 5877c12..d26f006 100644
Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.exe and b/shangjian/WPFupdate/obj/Debug/WPFupdate.exe differ
diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb b/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb
index 784c130..26da229 100644
Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb and b/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb differ
diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs
index d8efcd6..3d27e37 100644
--- a/shangjian/XGL.Data/DBService/DringRoomService.cs
+++ b/shangjian/XGL.Data/DBService/DringRoomService.cs
@@ -55,7 +55,7 @@ namespace XGL.Data.DBService
             //DataSet dtsetresult = Utils.netClientDBHelper.getDataSet(sqlHF);
             //string adwdwad = dtsetresult.Tables[0].Rows[7].ToString();
             //int number = Convert.ToInt32();
-            string sql = $@"SELECT TOP 23 ROW_NUMBER() OVER (ORDER BY dry.create_time) AS RowNumber,rfid_no,device_code,type,dry.create_time,dry.update_time,factory_no,dry.workorder_code,material_code,product_name FROM [dbo].[mes_dryinghouse_info] dry
+            string sql = $@"SELECT TOP 23 ROW_NUMBER() OVER (ORDER BY dry.create_time desc) AS RowNumber,rfid_no,device_code,type,dry.create_time,dry.update_time,factory_no,dry.workorder_code,material_code,product_name FROM [dbo].[mes_dryinghouse_info] dry
 LEFT JOIN pro_order_workorder workorder on dry.workorder_code = workorder.workorder_code where device_code = '{devicecode}' and type = '{inout}' and dry.del_flag='0'  order by dry.create_time desc ;";
             //获取绑定中，且RFID没有出烘房（在烘房内）的数据
             //            string sql = $@"SELECT rfid,workorder_code,product_name,product_code,isnull(car_num,0) as car_num,isnull([begin],'1900-01-01 08:00:00') as [begin],ord.status FROM [dbo].[mes_material_transfer_result] res
diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
index f4c154f..ad2e91f 100644
--- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
+++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
@@ -334,7 +334,6 @@ where CONVERT(VARCHAR(10), upload_time , 120)= CONVERT(VARCHAR(10), GetDate() ,
 
         }
 
-
         /// <summary>
         /// 获取库位内物料明细
         /// </summary>
@@ -490,7 +489,24 @@ product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantit
 from  pro_order_workorder workorder 
 left JOIN base_shifts_t shifts on workorder.shift_id = shifts.shift_id
 where 1=1 and 
- workorder.parent_order ='0' ";
+ workorder.parent_order ='0' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%'";
+            DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
+            if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
+            {
+                return dtset.Tables[0];
+            }
+            return null;
+        }
+
+
+        public DataTable GetSubOrderInfo(string workorderID)
+        {
+            string sql = $@"select workorder.factory_code,workorder.product_date as plan_time, workorder.workorder_id,workorder.workorder_code, product_code,product_name,
+product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id 
+from  pro_order_workorder workorder 
+left JOIN base_shifts_t shifts on workorder.shift_id = shifts.shift_id
+where 1=1 and 
+ workorder.parent_order ='{workorderID}'";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
             {
@@ -660,7 +676,7 @@ where pre.workorder_code = '{processid}'"; //where  CONVERT(VARCHAR(10), wet.pla
         /// <returns></returns>
         public bool UpdateSycnFlag(string workOrderID)
         {
-            string sql1 = $@"update pro_order_workorder set status = 'w2', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{workOrderID}' ";
+            string sql1 = $@"update pro_order_workorder set status = 'w2', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_code = '{workOrderID}' ";
 
             return Utils.netClientDBHelper.executeUpdate(sql1) > 0 ? true : false;
 
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 50824f7..21f8e08 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 cff1302..84a85dd 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 1820461..875e1a0 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll
index acfd5db..8a82c53 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 d332ee5..2d7d616 100644
Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ
diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll
index acfd5db..8a82c53 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 d332ee5..2d7d616 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/App.config b/shangjian/XGL/App.config
index 2138ec3..caa19a2 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C3" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
-		<add key="ClientMode" value="1" />
+		<add key="ClientMode" value="2" />
 		<add key="SerialPort" value="COM5" />
 		<add key="DryingHouseList" value="H16,H17,H18" />
 		<!--线体编码-->
diff --git a/shangjian/XGL/Resources/circular.png b/shangjian/XGL/Resources/circular.png
new file mode 100644
index 0000000..3cf6981
Binary files /dev/null and b/shangjian/XGL/Resources/circular.png differ
diff --git a/shangjian/XGL/Resources/leaf.png b/shangjian/XGL/Resources/leaf.png
new file mode 100644
index 0000000..f72403a
Binary files /dev/null and b/shangjian/XGL/Resources/leaf.png differ
diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml
index de75c87..a306fa4 100644
--- a/shangjian/XGL/Views/DryingRoomUC.xaml
+++ b/shangjian/XGL/Views/DryingRoomUC.xaml
@@ -57,51 +57,60 @@
                                 Margin="2,0,0,0" 
                                 Style="{DynamicResource ListBoxItemNormalBackground_Border_Style}">
                             <Grid >
-                               
+                                <Image Source="../Resources/leaf.png" Margin="223,-82,0,0" Width="50"/>
+                                <TextBlock Text="{Binding RowNumber}" 
+                                   VerticalAlignment="top"
+                                   Margin="250,8,0,0" FontWeight="Bold" Foreground="White"
+                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
+                                
                                 <TextBlock Text="{Binding product_name}" 
                                    VerticalAlignment="top"
-                                   Margin="80,22,0,0"  
+                                   Margin="45,22,0,0"  
                                    Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
                                 <TextBlock Text="{Binding workorder_code}" 
-                                   Margin="80,42,0,0"
+                                   Margin="45,42,0,0"
                                    HorizontalAlignment="left" 
                                    TextAlignment="left"
                                    Style="{DynamicResource ListBoxItemName_TextBlock_Style}"/>
                               
                                 <WrapPanel Orientation="Horizontal">
-                                    <TextBlock Margin="80,60,0,0" Text="RFID：" FontSize="14"/>
+                                    <TextBlock Margin="45,62,0,0" Text="RFID：" FontSize="14"/>
                                     <TextBlock Text="{Binding rfid_no}" 
                                        Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"
-                                       Margin="0,59,0,0"/>
+                                       Margin="0,62,0,0"/>
                                 </WrapPanel>
                                 <WrapPanel>
                                     <TextBlock Text="{Binding update_time,StringFormat=yyyy-MM-dd HH:mm:ss}" 
-                                       Margin="80,78,0,0"
+                                       Margin="45,82,0,0"
                                        Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
                                 </WrapPanel>
-                                <WrapPanel>
+                                <!--<WrapPanel>
                                     <TextBlock Text="{Binding RowNumber}" 
                                    VerticalAlignment="top"
-                                   Margin="130,96,0,0"  
+                                   Margin="225,-80,0,0"  
                                    Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
                                   
                                 </WrapPanel>
                                 <TextBlock Text="#"  
                                    Margin="148,96,0,0"  
-                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>
-                                <Border 
-                                    Margin="0,12,0,0"
+                                   Style="{DynamicResource ListBoxItemContent_TextBlock_Style}"/>-->
+                                <Grid 
+                                    Margin="-15,12,0,0"
                                     Width="90" 
                                     Height="102" 
                                     VerticalAlignment="Top" 
                                     HorizontalAlignment="Left" >
-                                    <Image Source="../Resources/lanjuLogo.png" VerticalAlignment="Stretch"/>
+                                    <Image Source="../Resources/circular.png"  Width="10" Height="10"  Margin="0,-62,0,0"/>
+                                    <Image Source="../Resources/circular.png"  Width="10" Height="10"  Margin="0,-22,0,0"/>
+                                    <Image Source="../Resources/circular.png"  Width="10" Height="10"  Margin="0,18,0,0"/>
+                                    <Image Source="../Resources/circular.png"  Width="10" Height="10"  Margin="0,56,0,0"/>
+                                    <!--<Image Source="../Resources/lanjuLogo.png" VerticalAlignment="Stretch"/>-->
                                     <!--<StackPanel Orientation="Vertical">
                                         <TextBlock Text="{Binding rfid_no}" FontSize="18" 
                                                Foreground="{Binding rfid_no,Converter={StaticResource ForeGroundBatchType}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                         <Image Source="..\Img\1.png"></Image>
                                     </StackPanel>-->
-                                </Border>
+                                </Grid>
                             </Grid>
                         </Border>
 
@@ -223,7 +232,7 @@
             <Setter Property="TextWrapping" Value="Wrap"/>
         </Style>
         <Style x:Key="ListBoxItemContent_TextBlock_Style" TargetType="{x:Type TextBlock}">
-            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="FontSize" Value="14"/> 
             <Setter Property="FontFamily" Value="微软雅黑"/>
             <Setter Property="Foreground" Value="#333333"/>
             <Setter Property="TextWrapping" Value="Wrap"/>
@@ -396,9 +405,12 @@
                                         <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
 
-                                    <!-- 标题部分 -->
-                                    <TextBlock Text="{TemplateBinding Header}" Margin="8,0,0,0" FontWeight="Bold"/>
-
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="../Resources/icon-title.png" Margin="10,5,10,0"/>
+                                        <!-- 标题部分 -->
+                                        <TextBlock Text="{TemplateBinding Header}" Margin="0,5,0,0" FontWeight="Bold"/>
+                                    </StackPanel>
+                                   
                                     <!-- 内容部分带滚动条 -->
                                     <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" PreviewMouseWheel ="ScrollViewer_PreviewMouseWheel">
                                         <ContentPresenter ContentSource="Content"/>
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml
index 7cd2acb..403fbbc 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml
@@ -175,7 +175,7 @@
                     Grid.Column="0"
                     Width="175"
                     Height="37"
-                    Margin="26,0,0,0"
+                    Margin="18,0,0,0"
                     HorizontalAlignment="Left">
                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                             <Image Source="../Resources/icon-title.png" Margin="0,5,10,0"/>
diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj
index 2a8056e..0a57ca1 100644
--- a/shangjian/XGL/XGL.csproj
+++ b/shangjian/XGL/XGL.csproj
@@ -1070,12 +1070,14 @@
     <EmbeddedResource Include="Resources\lanjuLogoNew.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <Resource Include="Resources\circular.png" />
     <Content Include="Resources\hongfang.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Resource Include="Resources\factory.png" />
     <Resource Include="Resources\device.png" />
     <Resource Include="Resources\icon-title.png" />
+    <Resource Include="Resources\leaf.png" />
     <Content Include="Resources\nitsos.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
index 54826eb..811a0fa 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "37CEFA4A0AAF06BC553642AFA7E0F8D390F0FFA260D58943F57C160C6027736A"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A0549B58D56B50DC7E166E9B6D9A30427539AE148E0B5412D73119145C150BC5"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
index 54826eb..811a0fa 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "37CEFA4A0AAF06BC553642AFA7E0F8D390F0FFA260D58943F57C160C6027736A"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A0549B58D56B50DC7E166E9B6D9A30427539AE148E0B5412D73119145C150BC5"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGLFinishPro/App.config b/shangjian/XGLFinishPro/App.config
index 7044b4b..ffb6ec7 100644
--- a/shangjian/XGLFinishPro/App.config
+++ b/shangjian/XGLFinishPro/App.config
@@ -10,9 +10,9 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="1000" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="XL01" />
+		<add key="DeviceCode" value="XL04" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
-		<add key="ClientMode" value="1" />
+		<add key="ClientMode" value="0" />
 
 		<add key="SerialPort" value="COM5" />
  
diff --git a/shangjian/XGLFinishPro/LoginPage.xaml b/shangjian/XGLFinishPro/LoginPage.xaml
index 4e94293..9fb19e7 100644
--- a/shangjian/XGLFinishPro/LoginPage.xaml
+++ b/shangjian/XGLFinishPro/LoginPage.xaml
@@ -44,15 +44,23 @@
         <Grid Width="280" Height="240" VerticalAlignment="Bottom" Margin="0,150">
             <!--<TextBlock Text="模具管理系统" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="5" Foreground="Gray" FontSize="18"></TextBlock>-->
             <StackPanel VerticalAlignment="Center" Margin="10">
-                <!--<StackPanel Orientation="Horizontal">
-                    <TextBlock Text=""
-                </StackPanel>-->
-                <TextBox x:Name="username" materialDesign:HintAssist.Hint="账号"   Margin="0,5" FontFamily="Champagne &amp; Limousines" FontSize="18"></TextBox>
-
-                <PasswordBox x:Name="userpwd" materialDesign:HintAssist.Hint="密码"  Margin="0,10" FontFamily="Champagne &amp; Limousines" FontSize="18"></PasswordBox>
-                <!--<ComboBox x:Name="comboBoxTeam" Margin="0,5"/>-->
-                <ComboBox x:Name="comboBoxShift" Margin="0,5"/>
-                <DatePicker x:Name="datepickerWorkDate" Margin="0,5"/>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="用户:    " VerticalAlignment="Center"/>
+                    <TextBox x:Name="username" materialDesign:HintAssist.Hint="账号"   Margin="0,5" FontFamily="Champagne &amp; Limousines" FontSize="18" Width="210"></TextBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="密码:    " VerticalAlignment="Center"/>
+                    <PasswordBox x:Name="userpwd" materialDesign:HintAssist.Hint="密码"  Margin="0,10" FontFamily="Champagne &amp; Limousines" FontSize="18" Width="210"></PasswordBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="班次:    " VerticalAlignment="Center"/>
+                    <ComboBox x:Name="comboBoxShift" Margin="0,5"  Width="210"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="工作日: " VerticalAlignment="Center"/>
+                    <DatePicker x:Name="datepickerWorkDate" Margin="0,8"  Width="210"/>
+                </StackPanel>
+                <!--<ComboBox x:Name="comboBoxTeam" Margin="0,5"  Width="210"/>--> 
             </StackPanel>
          
         </Grid>
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
index c0eecd7..f98d303 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
@@ -110,76 +110,76 @@ namespace XGLFinishPro.Views
             {
                 List<FoamingMacModel> orderList = new List<FoamingMacModel>();
 
-                int currHour = DateTime.Now.Hour;
-                int currMinute = DateTime.Now.Minute;
-                //modelWareHouse = new List<WorkOrder>();
-                //userDbWareHouse = new DBService();
-                int shiftId = 0;
-                DataTable shiftlist = formingMachineService.GetShiftList();
-                string endTimeRecord = "";
-                string startTimeRecord = "";
-                foreach (DataRow shift in shiftlist.Rows)
-                {
-                    string[] timeStart = shift["Shift_Start_Time"].ToString().Split(':');
-                    string[] timeEnd = shift["Shift_End_Time"].ToString().Split(':');
+                //int currHour = DateTime.Now.Hour;
+                //int currMinute = DateTime.Now.Minute;
+                ////modelWareHouse = new List<WorkOrder>();
+                ////userDbWareHouse = new DBService();
+                //int shiftId = 0;
+                //DataTable shiftlist = formingMachineService.GetShiftList();
+                //string endTimeRecord = "";
+                //string startTimeRecord = "";
+                //foreach (DataRow shift in shiftlist.Rows)
+                //{
+                //    string[] timeStart = shift["Shift_Start_Time"].ToString().Split(':');
+                //    string[] timeEnd = shift["Shift_End_Time"].ToString().Split(':');
 
-                    // 创建两个不带日期的时间点
-                    TimeSpan currTime = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
-                    TimeSpan startTime = new TimeSpan(Convert.ToInt32(timeStart[0]), Convert.ToInt32(timeStart[1]), 0);  // 表示9小时45分钟0秒 
-                    TimeSpan endTime = new TimeSpan(Convert.ToInt32(timeEnd[0]), Convert.ToInt32(timeEnd[1]), 0);
-                    // 比较当前时间点和班次开始的时间点
-                    int comparisonResultStart = TimeSpan.Compare(currTime, startTime);
-                    // 比较当前时间点和班次结束的时间点
-                    int comparisonResultEnd = TimeSpan.Compare(currTime, endTime);
-                    //if (comparisonResultStart > 0) { Console.WriteLine("time1 大于 time2"); }
-                    if (comparisonResultStart >= 0 && comparisonResultEnd < 0)
-                    {
-                        endTimeRecord = shift["Shift_Start_Time"].ToString();
-                        startTimeRecord = shift["Shift_End_Time"].ToString();
-                        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
-                        break;
-                    }
-                    else if (comparisonResultStart >= 0 || comparisonResultEnd < 0)
-                    {
-                        endTimeRecord = shift["Shift_Start_Time"].ToString();
-                        startTimeRecord = shift["Shift_End_Time"].ToString();
-                        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
-                        break;
-                    }
-                    //if (Convert.ToInt32(timeStart[0]) <= currHourWithDecimal && currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
-                    //{
-                    //    shiftId = shift.shiftId;
-                    //    break;
-                    //}
-                    //else if (currHourWithDecimal >= Convert.ToInt32(timeStart[0]) || currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
-                    //{
-                    //    shiftId = shift.shiftId;
-                    //    break;
-                    //}
-                }
+                //    // 创建两个不带日期的时间点
+                //    TimeSpan currTime = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+                //    TimeSpan startTime = new TimeSpan(Convert.ToInt32(timeStart[0]), Convert.ToInt32(timeStart[1]), 0);  // 表示9小时45分钟0秒 
+                //    TimeSpan endTime = new TimeSpan(Convert.ToInt32(timeEnd[0]), Convert.ToInt32(timeEnd[1]), 0);
+                //    // 比较当前时间点和班次开始的时间点
+                //    int comparisonResultStart = TimeSpan.Compare(currTime, startTime);
+                //    // 比较当前时间点和班次结束的时间点
+                //    int comparisonResultEnd = TimeSpan.Compare(currTime, endTime);
+                //    //if (comparisonResultStart > 0) { Console.WriteLine("time1 大于 time2"); }
+                //    if (comparisonResultStart >= 0 && comparisonResultEnd < 0)
+                //    {
+                //        endTimeRecord = shift["Shift_Start_Time"].ToString();
+                //        startTimeRecord = shift["Shift_End_Time"].ToString();
+                //        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+                //        break;
+                //    }
+                //    else if (comparisonResultStart >= 0 || comparisonResultEnd < 0)
+                //    {
+                //        endTimeRecord = shift["Shift_Start_Time"].ToString();
+                //        startTimeRecord = shift["Shift_End_Time"].ToString();
+                //        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+                //        break;
+                //    }
+                //    //if (Convert.ToInt32(timeStart[0]) <= currHourWithDecimal && currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+                //    //{
+                //    //    shiftId = shift.shiftId;
+                //    //    break;
+                //    //}
+                //    //else if (currHourWithDecimal >= Convert.ToInt32(timeStart[0]) || currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+                //    //{
+                //    //    shiftId = shift.shiftId;
+                //    //    break;
+                //    //}
+                //}
 
-                string[] endTimeReally = endTimeRecord.Split(':');
-                string[] startTimeReally = startTimeRecord.Split(':');
-                DateTime currShiftDate = DateTime.Now.Date;
-                TimeSpan currTimeNew = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
-                TimeSpan startTimeNew = new TimeSpan(Convert.ToInt32(startTimeReally[0]), Convert.ToInt32(startTimeReally[1]), 0);  // 表示9小时45分钟0秒 
-                TimeSpan endTimeNew = new TimeSpan(Convert.ToInt32(endTimeReally[0]), Convert.ToInt32(endTimeReally[1]), 0);  // 表示9小时45分钟0秒 
-                //计算白夜班工作日期用
-                int resultstart = TimeSpan.Compare(currTimeNew, startTimeNew);
-                // 比较当前时间点和班次结束的时间点
-                int resultEnd = TimeSpan.Compare(currTimeNew, endTimeNew);
+                //string[] endTimeReally = endTimeRecord.Split(':');
+                //string[] startTimeReally = startTimeRecord.Split(':');
+                //DateTime currShiftDate = DateTime.Now.Date;
+                //TimeSpan currTimeNew = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+                //TimeSpan startTimeNew = new TimeSpan(Convert.ToInt32(startTimeReally[0]), Convert.ToInt32(startTimeReally[1]), 0);  // 表示9小时45分钟0秒 
+                //TimeSpan endTimeNew = new TimeSpan(Convert.ToInt32(endTimeReally[0]), Convert.ToInt32(endTimeReally[1]), 0);  // 表示9小时45分钟0秒 
+                ////计算白夜班工作日期用
+                //int resultstart = TimeSpan.Compare(currTimeNew, startTimeNew);
+                //// 比较当前时间点和班次结束的时间点
+                //int resultEnd = TimeSpan.Compare(currTimeNew, endTimeNew);
 
-                //夜班、
-                if (resultstart < 0 && resultEnd < 0)
-                {
-                    currShiftDate = DateTime.Now.Date.AddDays(-1);
-                }
+                ////夜班、
+                //if (resultstart < 0 && resultEnd < 0)
+                //{
+                //    currShiftDate = DateTime.Now.Date.AddDays(-1);
+                //}
 
 
 
                 //modelWareHouse = new List<WorkOrder>();
 
-                DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, currShiftDate.ToString());//formingMachineService.GetFormingMachineInfo(deviceCode, currShiftDate.ToString());
+                DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, LoginUser.WorkDate);//formingMachineService.GetFormingMachineInfo(deviceCode, currShiftDate.ToString());
                 if (dt == null) return;
 
                 if (orderList != null)
@@ -208,76 +208,76 @@ namespace XGLFinishPro.Views
             {
                 List<FoamingMacModel> orderList = new List<FoamingMacModel>();
 
-                int currHour = DateTime.Now.Hour;
-                int currMinute = DateTime.Now.Minute;
-                //modelWareHouse = new List<WorkOrder>();
-                //userDbWareHouse = new DBService();
-                int shiftId = 0;
-                DataTable shiftlist = formingMachineService.GetShiftList();
-                string endTimeRecord = "";
-                string startTimeRecord = "";
-                foreach (DataRow shift in shiftlist.Rows)
-                {
-                    string[] timeStart = shift["Shift_Start_Time"].ToString().Split(':');
-                    string[] timeEnd = shift["Shift_End_Time"].ToString().Split(':');
+                //int currHour = DateTime.Now.Hour;
+                //int currMinute = DateTime.Now.Minute;
+                ////modelWareHouse = new List<WorkOrder>();
+                ////userDbWareHouse = new DBService();
+                //int shiftId = 0;
+                //DataTable shiftlist = formingMachineService.GetShiftList();
+                //string endTimeRecord = "";
+                //string startTimeRecord = "";
+                //foreach (DataRow shift in shiftlist.Rows)
+                //{
+                //    string[] timeStart = shift["Shift_Start_Time"].ToString().Split(':');
+                //    string[] timeEnd = shift["Shift_End_Time"].ToString().Split(':');
 
-                    // 创建两个不带日期的时间点
-                    TimeSpan currTime = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
-                    TimeSpan startTime = new TimeSpan(Convert.ToInt32(timeStart[0]), Convert.ToInt32(timeStart[1]), 0);  // 表示9小时45分钟0秒 
-                    TimeSpan endTime = new TimeSpan(Convert.ToInt32(timeEnd[0]), Convert.ToInt32(timeEnd[1]), 0);
-                    // 比较当前时间点和班次开始的时间点
-                    int comparisonResultStart = TimeSpan.Compare(currTime, startTime);
-                    // 比较当前时间点和班次结束的时间点
-                    int comparisonResultEnd = TimeSpan.Compare(currTime, endTime);
-                    //if (comparisonResultStart > 0) { Console.WriteLine("time1 大于 time2"); }
-                    if (comparisonResultStart >= 0 && comparisonResultEnd < 0)
-                    {
-                        endTimeRecord = shift["Shift_Start_Time"].ToString();
-                        startTimeRecord = shift["Shift_End_Time"].ToString();
-                        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
-                        break;
-                    }
-                    else if (comparisonResultStart >= 0 || comparisonResultEnd < 0)
-                    {
-                        endTimeRecord = shift["Shift_Start_Time"].ToString();
-                        startTimeRecord = shift["Shift_End_Time"].ToString();
-                        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
-                        break;
-                    }
-                    //if (Convert.ToInt32(timeStart[0]) <= currHourWithDecimal && currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
-                    //{
-                    //    shiftId = shift.shiftId;
-                    //    break;
-                    //}
-                    //else if (currHourWithDecimal >= Convert.ToInt32(timeStart[0]) || currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
-                    //{
-                    //    shiftId = shift.shiftId;
-                    //    break;
-                    //}
-                }
+                //    // 创建两个不带日期的时间点
+                //    TimeSpan currTime = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+                //    TimeSpan startTime = new TimeSpan(Convert.ToInt32(timeStart[0]), Convert.ToInt32(timeStart[1]), 0);  // 表示9小时45分钟0秒 
+                //    TimeSpan endTime = new TimeSpan(Convert.ToInt32(timeEnd[0]), Convert.ToInt32(timeEnd[1]), 0);
+                //    // 比较当前时间点和班次开始的时间点
+                //    int comparisonResultStart = TimeSpan.Compare(currTime, startTime);
+                //    // 比较当前时间点和班次结束的时间点
+                //    int comparisonResultEnd = TimeSpan.Compare(currTime, endTime);
+                //    //if (comparisonResultStart > 0) { Console.WriteLine("time1 大于 time2"); }
+                //    if (comparisonResultStart >= 0 && comparisonResultEnd < 0)
+                //    {
+                //        endTimeRecord = shift["Shift_Start_Time"].ToString();
+                //        startTimeRecord = shift["Shift_End_Time"].ToString();
+                //        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+                //        break;
+                //    }
+                //    else if (comparisonResultStart >= 0 || comparisonResultEnd < 0)
+                //    {
+                //        endTimeRecord = shift["Shift_Start_Time"].ToString();
+                //        startTimeRecord = shift["Shift_End_Time"].ToString();
+                //        shiftId = Convert.ToInt32(shift["shift_id"].ToString());
+                //        break;
+                //    }
+                //    //if (Convert.ToInt32(timeStart[0]) <= currHourWithDecimal && currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+                //    //{
+                //    //    shiftId = shift.shiftId;
+                //    //    break;
+                //    //}
+                //    //else if (currHourWithDecimal >= Convert.ToInt32(timeStart[0]) || currHourWithDecimal < Convert.ToInt32(timeEnd[0]))
+                //    //{
+                //    //    shiftId = shift.shiftId;
+                //    //    break;
+                //    //}
+                //}
 
-                string[] endTimeReally = endTimeRecord.Split(':');
-                string[] startTimeReally = startTimeRecord.Split(':');
-                DateTime currShiftDate = DateTime.Now.Date;
-                TimeSpan currTimeNew = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
-                TimeSpan startTimeNew = new TimeSpan(Convert.ToInt32(startTimeReally[0]), Convert.ToInt32(startTimeReally[1]), 0);  // 表示9小时45分钟0秒 
-                TimeSpan endTimeNew = new TimeSpan(Convert.ToInt32(endTimeReally[0]), Convert.ToInt32(endTimeReally[1]), 0);  // 表示9小时45分钟0秒 
-                //计算白夜班工作日期用
-                int resultstart = TimeSpan.Compare(currTimeNew, startTimeNew);
-                // 比较当前时间点和班次结束的时间点
-                int resultEnd = TimeSpan.Compare(currTimeNew, endTimeNew);
+                //string[] endTimeReally = endTimeRecord.Split(':');
+                //string[] startTimeReally = startTimeRecord.Split(':');
+                //DateTime currShiftDate = DateTime.Now.Date;
+                //TimeSpan currTimeNew = new TimeSpan(currHour, currMinute, 0); // 获取当前小时+分钟数
+                //TimeSpan startTimeNew = new TimeSpan(Convert.ToInt32(startTimeReally[0]), Convert.ToInt32(startTimeReally[1]), 0);  // 表示9小时45分钟0秒 
+                //TimeSpan endTimeNew = new TimeSpan(Convert.ToInt32(endTimeReally[0]), Convert.ToInt32(endTimeReally[1]), 0);  // 表示9小时45分钟0秒 
+                ////计算白夜班工作日期用
+                //int resultstart = TimeSpan.Compare(currTimeNew, startTimeNew);
+                //// 比较当前时间点和班次结束的时间点
+                //int resultEnd = TimeSpan.Compare(currTimeNew, endTimeNew);
 
-                //夜班、
-                if (resultstart < 0 && resultEnd < 0)
-                {
-                    currShiftDate = DateTime.Now.Date.AddDays(-1);
-                }
+                ////夜班、
+                //if (resultstart < 0 && resultEnd < 0)
+                //{
+                //    currShiftDate = DateTime.Now.Date.AddDays(-1);
+                //}
 
 
 
                 //modelWareHouse = new List<WorkOrder>();
 
-                DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, currShiftDate.ToString());
+                DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, LoginUser.WorkDate);
                 if (dt == null) return;
 
                 this.dgWorkOrderInfo.ItemsSource = null;
@@ -316,9 +316,7 @@ namespace XGLFinishPro.Views
             PauseOrderWin pauseOrderWin = new PauseOrderWin();
             if (pauseOrderWin.ShowDialog() == true)
             {
-
-
-                formingMachineService.UpdateWorkOrder(workordercode, "w4", pauseOrderWin.remark, pauseOrderWin.type, deviceCode);
+                PauseRecoverOrderS(workordercode,"w4", pauseOrderWin);
                 GetWorkOrderInfo();
             }
             //MessageBoxResult result = MessageBox.Show("你确定要暂停该工单吗？", "温馨提示", MessageBoxButton.YesNo, MessageBoxImage.Information);
@@ -327,6 +325,26 @@ namespace XGLFinishPro.Views
 
         }
 
+        private bool PauseRecoverOrderS(string workordercode,string status, PauseOrderWin pauseOrderWin)
+        {
+            bool updatestatus = formingMachineService.UpdateWorkOrder(workordercode, status, pauseOrderWin.remark, pauseOrderWin.type, deviceCode);
+            if (!updatestatus)
+            {
+                CustomMessageBox.Show("操作失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
+            }
+            DataTable dtSubOrders = userDbWareHouse.GetSubOrderInfo(workordercode);
+            if (dtSubOrders != null)
+            {
+                // 递归更新子单状态
+                foreach (DataRow subOrder in dtSubOrders.Rows)
+                {
+                    UpdateOrderStatus(subOrder["workorder_code"].ToString());
+                }
+            }
+
+            return true;
+        }
+
         private void btnRecover_Click(object sender, RoutedEventArgs e)
         {
             //var selectedRow = dgWorkOrderInfo.SelectedItem as FoamingMacModel;
@@ -349,7 +367,8 @@ namespace XGLFinishPro.Views
             PauseOrderWin pauseOrderWin = new PauseOrderWin();
             if (pauseOrderWin.ShowDialog() == true)
             {
-                formingMachineService.UpdateWorkOrder(workordercode, "w2", pauseOrderWin.remark, pauseOrderWin.type, deviceCode);
+                PauseRecoverOrderS(workordercode, "w2", pauseOrderWin);
+                //formingMachineService.UpdateWorkOrder(workordercode, "w2", pauseOrderWin.remark, pauseOrderWin.type, deviceCode);
                 GetWorkOrderInfo();
             }
 
@@ -439,12 +458,7 @@ namespace XGLFinishPro.Views
                         newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
                     }
                 }
-                    newReportCode = DateTime.Now.ToString("yyyyMMdd")+"0001";
-                }
-                else
-                {
-                    newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
-                }
+                   
 
                 ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
 
@@ -535,7 +549,7 @@ namespace XGLFinishPro.Views
                 return;
             }
 
-            string workorderID = (dgWorkOrderInfo.SelectedItem as DataRowView)["workorder_id"].ToString();
+            string workorderID = (dgWorkOrderInfo.SelectedItem as DataRowView)["workorder_code"].ToString();
 
             string status = (dgWorkOrderInfo.SelectedItem as DataRowView)["status"].ToString();
 
@@ -547,9 +561,8 @@ namespace XGLFinishPro.Views
                     return;
                 }
             }
-            //更新工单状态
-            var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
-            if (!updatestatus)
+            //更新工单状态 
+            if (!UpdateOrderStatus(workorderID))
             {
                 CustomMessageBox.Show("开始工单失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
             }
@@ -558,6 +571,26 @@ namespace XGLFinishPro.Views
                 TimerDeciveState_Elapsed(null,null);
             }
         }
+        private bool UpdateOrderStatus(string workorderID)
+        {
+            //更新工单状态
+            var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
+            if (!updatestatus)
+            {
+                CustomMessageBox.Show("开始工单失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
+            }
+            DataTable dtSubOrders = userDbWareHouse.GetSubOrderInfo(workorderID);
+            if (dtSubOrders != null)
+            {
+                // 递归更新子单状态
+                foreach (DataRow subOrder in dtSubOrders.Rows)
+                {
+                    UpdateOrderStatus(subOrder["workorder_code"].ToString());
+                }
+            }
+
+            return true;
+        }
     }
     public class ReportWork
     {
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml b/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml
index c8c6265..007dea3 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml
@@ -171,7 +171,7 @@
                     Grid.Column="0"
                     Width="175"
                     Height="37"
-                    Margin="26,0,0,0"
+                    Margin="18,0,0,0"
                     HorizontalAlignment="Left">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                         <Image Source="../Resources/icon-title.png" Margin="0,5,10,0"/>
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml.cs
index 9d8ac13..f1369cb 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_Prepare.xaml.cs
@@ -156,7 +156,7 @@ namespace XGLFinishPro.Views
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            this.dateStart.SelectedDate = DateTime.Now;
+            this.dateStart.SelectedDate = Convert.ToDateTime(LoginUser.WorkDate);//DateTime.Now;
             timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval"));
             timerDeciveState.Elapsed += TimerDeciveState_Elapsed;
             //timerDeciveState.Start();
@@ -217,7 +217,7 @@ namespace XGLFinishPro.Views
                 return;
             }
           
-            string workorderID = (WorkOrder.SelectedItem as DataRowView)["workorder_id"].ToString();
+            string workorderID = (WorkOrder.SelectedItem as DataRowView)["workorder_code"].ToString();
          
             string status = (WorkOrder.SelectedItem as DataRowView)["status"].ToString();
 
@@ -244,8 +244,8 @@ namespace XGLFinishPro.Views
 
         
             //更新工单状态
-            var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
-            if (!updatestatus)
+            //var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
+            if (!UpdateOrderStatus(workorderID))
             {
                 CustomMessageBox.Show("开始工单失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
             } 
@@ -353,6 +353,27 @@ namespace XGLFinishPro.Views
 
 
         }
+        private bool UpdateOrderStatus(string workorderID)
+        {
+            //更新工单状态
+            var updatestatus = userDbWareHouse.UpdateSycnFlag(workorderID);
+            if (!updatestatus)
+            {
+                CustomMessageBox.Show("开始工单失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
+            }
+            DataTable dtSubOrders = userDbWareHouse.GetSubOrderInfo(workorderID);
+            if (dtSubOrders != null)
+            {
+                // 递归更新子单状态
+                foreach (DataRow subOrder in dtSubOrders.Rows)
+                {
+                    UpdateOrderStatus(subOrder["workorder_code"].ToString());
+                }
+            }
+           
+            return true;
+        }
+
 
         private void Flow_Click(object sender, RoutedEventArgs e)
         {