diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index da3ff3e..5883e8c 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application
index 24d78c2..b36edf3 100644
--- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application
+++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application
@@ -14,7 +14,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>u1K2cqbB56xwixKbhy0eKCftxfa07TGwWwtdOtL8PIs=</dsig:DigestValue>
+        <dsig:DigestValue>jmdpeV3d0u6iWdBPN4dhr2L2dVWme5oYZd5aPRm+oYU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe
index 7095052..865a66e 100644
Binary files a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe and b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe differ
diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest
index 49d1b82..c792b76 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>WAPtOpDlGQDOGkow6DsogCU4DmdHhdL4pDDQZXfblYE=</dsig:DigestValue>
+        <dsig:DigestValue>j5D+9oUALJ/4wUhf4EV2qXiJ/BGxp9B00XdfuYnCRnI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb
index a7f695d..7169c74 100644
Binary files a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb and b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb differ
diff --git a/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe
index 7095052..865a66e 100644
Binary files a/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe and b/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe differ
diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application
index 24d78c2..b36edf3 100644
--- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application
+++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application
@@ -14,7 +14,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>u1K2cqbB56xwixKbhy0eKCftxfa07TGwWwtdOtL8PIs=</dsig:DigestValue>
+        <dsig:DigestValue>jmdpeV3d0u6iWdBPN4dhr2L2dVWme5oYZd5aPRm+oYU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache
index 97c5d4d..ac05f57 100644
Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache differ
diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe
index 7095052..865a66e 100644
Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe differ
diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest
index 49d1b82..c792b76 100644
--- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest
+++ b/shangjian/AutoUpdate/obj/x86/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>WAPtOpDlGQDOGkow6DsogCU4DmdHhdL4pDDQZXfblYE=</dsig:DigestValue>
+        <dsig:DigestValue>j5D+9oUALJ/4wUhf4EV2qXiJ/BGxp9B00XdfuYnCRnI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb
index a7f695d..7169c74 100644
Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe
index e3b4e0c..ddb18ed 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 303470b..38197a5 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 a1c3f68..b70636b 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 4cc3fea..d47b39b 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 1a09629..819d44a 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 b18a7b7..0959ad7 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 9f6865a..d735f22 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 966febc..61227a4 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll
index c4b3406..4084aad 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll differ
diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb
index 733af8f..a9e9227 100644
Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb differ
diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache
index ab18f37..d4cbf1a 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 e3b4e0c..ddb18ed 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 303470b..38197a5 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 a1c3f68..b70636b 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 4cc3fea..d47b39b 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 9f6865a..d735f22 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 966febc..61227a4 100644
Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache
index 0effda4..ee80c4b 100644
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll
index a1c3f68..b70636b 100644
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb
index 4cc3fea..d47b39b 100644
Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll
index a1c3f68..b70636b 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 4cc3fea..d47b39b 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 9f6865a..d735f22 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 966febc..61227a4 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 42ce042..991e910 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs
index 242b176..f522f5f 100644
--- a/shangjian/XGL.Data/DBService/DBService.cs
+++ b/shangjian/XGL.Data/DBService/DBService.cs
@@ -788,7 +788,22 @@ where workorder.workorder_id = '{workOrderNo}'";
 
 
 
-
+        /// <summary>
+        /// 获取日志
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLogList(string datetime,string key)
+        {
+            //根据工单获取成型机
+            string sql = $@"SELECT * FROM [dbo].[mes_interface_log] where  CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{key}%' order by creter_time desc ; ";
+             
+            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;
+        }
 
 
 
@@ -1077,6 +1092,9 @@ where workorder.workorder_id = '{workOrderNo}'";
             }
             return null;
         }
+
+
+
         /// <summary>
         /// 获取库位内物料明细
         /// </summary>
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll
index a1c3f68..b70636b 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb
index 4cc3fea..d47b39b 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll
index 1a09629..819d44a 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb
index b18a7b7..0959ad7 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll
index 9f6865a..d735f22 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll differ
diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb
index 966febc..61227a4 100644
Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb differ
diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache
index 838b0c5..468b117 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 1a09629..819d44a 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 b18a7b7..0959ad7 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 9f6865a..d735f22 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 966febc..61227a4 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 9f6865a..d735f22 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 966febc..61227a4 100644
Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb differ
diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll
index c4b3406..4084aad 100644
Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll differ
diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb
index 733af8f..a9e9227 100644
Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb differ
diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll
index c4b3406..4084aad 100644
Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll differ
diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb
index 733af8f..a9e9227 100644
Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb differ
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index 1a26756..2a813b5 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C6" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-		<add key="ClientMode" value="0" />
+		<add key="ClientMode" value="1" />
 		<add key="SerialPort" value="COM5" />
 		<add key="DryingHouseList" value="H1,H2,H3" />
 	 
diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml
index eabd08d..1a192b3 100644
--- a/shangjian/XGL/FormItem/Main.xaml
+++ b/shangjian/XGL/FormItem/Main.xaml
@@ -560,7 +560,7 @@
                         HorizontalAlignment="Left" 
                         Content="20231001001"
                         FontSize="20px"
-                        Foreground="Black" VerticalContentAlignment="Center"/>
+                        Foreground="Blue" FontStretch="Condensed" VerticalContentAlignment="Center"/>
                     </StackPanel>
                     <Button  BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent"  FontSize="26" Height="40" Width="50" HorizontalAlignment="Left" x:Name="btnZXH"    Margin="1200,4,0,2" ToolTip="最小化" Click="btnZXH_Click"  > 
                             <Image Source="..\Resources\zxh.png" /> 
diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs
index 664732e..49969d7 100644
--- a/shangjian/XGL/FormItem/Main.xaml.cs
+++ b/shangjian/XGL/FormItem/Main.xaml.cs
@@ -257,8 +257,7 @@ namespace XGL.FormItem
             }
             catch (Exception ex)
             {
-
-                throw;
+                LogHelper.instance.log.Error("获取设备状态时发生异常："+ex.Message);
             }
          
            
diff --git a/shangjian/XGL/Tools/UserDatePicker.cs b/shangjian/XGL/Tools/UserDatePicker.cs
new file mode 100644
index 0000000..237cdc9
--- /dev/null
+++ b/shangjian/XGL/Tools/UserDatePicker.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace XGL.Tools
+{
+    public class UserDatePicker : DatePicker
+    {
+        //日期文本框
+        private DatePickerTextBox textBox;
+        private Popup popup;
+        //今天
+        private TextBlock goToday;
+        //清空
+        private TextBlock goClear;
+
+        #region 重载初始化
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            textBox = this.GetTemplateChild("PART_TextBox") as DatePickerTextBox;
+            popup = this.GetTemplateChild("PART_Popup") as Popup;
+            popup.Width = 300;
+            popup.Height = 300;
+            if (AlternativeCalendarStyle != null)
+            {
+                System.Windows.Controls.Calendar calendar = popup.Child as System.Windows.Controls.Calendar;
+                calendar.Style = AlternativeCalendarStyle;
+                calendar.ApplyTemplate();
+                goToday = calendar.Template.FindName("PART_GoToday", calendar) as TextBlock;
+                if (goToday != null)
+                {
+                    goToday.MouseLeftButtonUp -= new MouseButtonEventHandler(goToday_MouseLeftButtonUp);
+                    goToday.MouseLeftButtonUp += new MouseButtonEventHandler(goToday_MouseLeftButtonUp);
+                }
+                goClear = calendar.Template.FindName("PART_GoClear", calendar) as TextBlock;
+                if (goClear != null)
+                {
+                    goClear.MouseLeftButtonUp -= new MouseButtonEventHandler(goClear_MouseLeftButtonUp);
+                    goClear.MouseLeftButtonUp += new MouseButtonEventHandler(goClear_MouseLeftButtonUp);
+                }
+            }
+            this.SelectedDateFormat = DatePickerFormat.Short;
+
+        }
+        #endregion
+
+        /// <summary>
+        /// AlternativeCalendarStyle Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AlternativeCalendarStyleProperty =
+            DependencyProperty.Register("AlternativeCalendarStyle", typeof(Style), typeof(UserDatePicker),
+                new FrameworkPropertyMetadata((Style)null,
+                    null));
+
+
+        public Style AlternativeCalendarStyle
+        {
+            get { return (Style)GetValue(AlternativeCalendarStyleProperty); }
+            set { SetValue(AlternativeCalendarStyleProperty, value); }
+        }
+
+        #region 今天
+        private void goToday_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.SelectedDate = DateTime.Now;
+            popup.IsOpen = false;
+        }
+        #endregion
+
+        #region 清空
+        private void goClear_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            this.SelectedDate = null;
+            popup.IsOpen = false;
+        }
+        #endregion
+
+
+    }
+}
diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml b/shangjian/XGL/Views/LanJu_InOut.xaml
index 8c13010..c9e6bf2 100644
--- a/shangjian/XGL/Views/LanJu_InOut.xaml
+++ b/shangjian/XGL/Views/LanJu_InOut.xaml
@@ -16,7 +16,17 @@
         </Style>
         <convert:MyValueConverter x:Key="MyConverter"/>
         <convert:OrderInOutConverter x:Key="TaskCodeConverter"/>
-        <convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/> 
+        <convert:BtnBackGroundColorConverter x:Key="ButtonContentToBackgroundColorConverter"/>
+        <SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
+        <SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
+        <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
+            <Setter Property="Background" Value="{StaticResource EvenRowBackground}"/>
+            <Style.Triggers>
+                <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                    <Setter Property="Background" Value="{StaticResource OddRowBackground}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
     </UserControl.Resources>
     <Viewbox Stretch="Fill">
         <Canvas
@@ -39,6 +49,9 @@
                     VerticalAlignment="Top"
                     IsReadOnly="True"
                     CanUserAddRows="False"
+                      AlternatingRowBackground="{StaticResource OddRowBackground}"
+          AlternationCount="2"
+          RowStyle="{StaticResource DataGridRowStyle}"
                     LoadingRow="dgInOutRecord_LoadingRow"
                     HeadersVisibility="Column"
                     AutoGenerateColumns="False">
@@ -55,7 +68,7 @@
                         <DataGridTemplateColumn Header=" 序号" Width="70" MinWidth="10" IsReadOnly="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                                    <TextBlock  Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml
index ffd23b9..67e38b8 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml
@@ -19,6 +19,16 @@
             <Setter Property="TextBlock.TextAlignment" Value="Center" />
             <Setter Property="TextBlock.FontSize" Value="22" />
         </Style>
+        <SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
+        <SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
+        <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
+            <Setter Property="Background" Value="{StaticResource EvenRowBackground}"/>
+            <Style.Triggers>
+                <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                    <Setter Property="Background" Value="{StaticResource OddRowBackground}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
     </UserControl.Resources>
 
     <Grid  Background="#F2F3F5" >
@@ -325,7 +335,25 @@
                         Foreground="White"
                 Click="btnRefresh_Click" Content="刷新"></Button>
         </StackPanel>
-        
+        <StackPanel
+                    Grid.Row="0"
+                    Grid.Column="6"
+                    Width="220"
+                    Height="90">
+            <Button
+                        x:Name="btnCheckLog"
+                        Grid.Row="1"
+                        Grid.Column="5"
+                        Width="170"
+                        Height="60"
+                        Margin="25,5"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Background="#2B7EE6" 
+                        FontSize="20"
+                        Foreground="White"
+                Click="btnCheckLog_Click" Content="查看日志"></Button>
+        </StackPanel>
        
 
         <DataGrid
@@ -335,6 +363,9 @@
                     MinWidth="1000" 
                     MinHeight="340"
             MaxHeight="400"
+              AlternatingRowBackground="{StaticResource OddRowBackground}"
+          AlternationCount="2"
+          RowStyle="{StaticResource DataGridRowStyle}"
                     Margin="20,0,0,5"
                     LoadingRow="dgWorkOrderInfo_LoadingRow"
                     HeadersVisibility="Column"
@@ -355,7 +386,7 @@
                 <DataGridTemplateColumn Header=" 序号" Width="50" MinWidth="10" IsReadOnly="True">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                            <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index c59080e..6c5d398 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -289,5 +289,11 @@ namespace XGL.Views
             ShouPeiWin shouPeiWin = new ShouPeiWin(selectedRow);
             shouPeiWin.ShowDialog();
         }
+
+        private void btnCheckLog_Click(object sender, RoutedEventArgs e)
+        {
+            ViewLogWin viewLogWin = new ViewLogWin();
+            viewLogWin.ShowDialog();
+        }
     }
 }
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml
index 530a54e..ada69d9 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml
@@ -156,7 +156,7 @@
                         <DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                                    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -256,7 +256,7 @@
                             <DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                                    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn> 
diff --git a/shangjian/XGL/Views/ViewLogWin.xaml b/shangjian/XGL/Views/ViewLogWin.xaml
new file mode 100644
index 0000000..92a8d0a
--- /dev/null
+++ b/shangjian/XGL/Views/ViewLogWin.xaml
@@ -0,0 +1,134 @@
+<Window x:Class="XGL.Views.ViewLogWin"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XGL.Views" xmlns:localDate="clr-namespace:XGL.Tools"
+        mc:Ignorable="d"
+        Title="ViewLogWin" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" WindowStyle="None" WindowState="Maximized">
+    <Window.Resources>
+        <SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
+        <SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
+        <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
+            <Setter Property="Background" Value="{StaticResource EvenRowBackground}"/>
+            <Style.Triggers>
+                <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                    <Setter Property="Background" Value="{StaticResource OddRowBackground}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+        <Style x:Key="CustomCellStyle" TargetType="DataGridCell">
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="TextBlock.TextAlignment" Value="Center" />
+            <Setter Property="TextBlock.FontSize" Value="22" />
+        </Style>
+        <!--日历样式-->
+        <Style TargetType="CalendarDayButton" x:Key="CalendarDayBtnStyle">
+            <Setter Property="FontSize" Value="16"></Setter>
+        </Style>
+        <Style x:Key="calendarWithGotToTodayStyle"
+                TargetType="{x:Type Calendar}">
+            <Setter Property="CalendarDayButtonStyle"
+                    Value="{StaticResource CalendarDayBtnStyle}"></Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Calendar}">
+                        <Border>
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel x:Name="PART_Root"
+                                            HorizontalAlignment="Center" Background="#FF878787">
+                                    <CalendarItem x:Name="PART_CalendarItem"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    Background="{TemplateBinding Background}"
+                                                    Style="{TemplateBinding CalendarItemStyle}" 
+                                                    Height="{TemplateBinding Height}"                                 
+                                                     />
+                                    <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="30"></RowDefinition>
+                                        </Grid.RowDefinitions>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="52"></ColumnDefinition>
+                                            <ColumnDefinition Width="26"></ColumnDefinition>
+                                            <ColumnDefinition Width="52"></ColumnDefinition>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock x:Name="PART_GoToday"
+                                                Width="40" Height="20"
+                                                Text="今天" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Cursor="Hand" Foreground="#FFFFFFFF" />
+                                        <TextBlock Grid.Column="2" x:Name="PART_GoClear"
+                                                Width="40" Height="20" 
+                                                Text="清空" FontSize="18"  VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Cursor="Hand" Foreground="#FFFFFFFF"  />
+                                    </Grid>
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="0.9*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
+            <Label Content="请选择日期：" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
+            <localDate:UserDatePicker x:Name="dateStart" VerticalAlignment="Center"  AlternativeCalendarStyle="{StaticResource calendarWithGotToTodayStyle}"  
+                                Width="150"   SelectedDateFormat="Short" IsTodayHighlighted="True">
+            </localDate:UserDatePicker>
+
+            <Label Content="关键字：" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
+            <TextBox x:Name="txtKey" Width="150" Height="30" FontSize="18" VerticalContentAlignment="Center"></TextBox>
+            <Button x:Name="btnQueryLog" Content="查询" Foreground="White" Margin="20,0,0,0" FontSize="18" Background="#2B7EE6" Width="100" Height="30" Click="btnQueryLog_Click"/>
+           
+        </StackPanel>
+        <Button x:Name="btnClose"  Content="关闭" Foreground="White" FontSize="18" Background="#2B7EE6" Width="100" Margin="20" Height="30" Click="btnClose_Click" HorizontalAlignment="Right"/>
+        <DataGrid
+            x:Name="dgLogInfo"
+            Grid.Row="1"
+                
+             
+                    MinHeight="340"
+                     AlternatingRowBackground="{StaticResource OddRowBackground}"
+          AlternationCount="2"
+          RowStyle="{StaticResource DataGridRowStyle}"
+                    Margin="20,0,0,5"
+                    LoadingRow="dgLogInfo_LoadingRow"
+                    HeadersVisibility="Column"
+                    CellStyle="{StaticResource CustomCellStyle}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top" IsReadOnly="True"
+                    AutoGenerateColumns="False" CanUserAddRows="False">
+            <DataGrid.ColumnHeaderStyle  >
+                <Style TargetType="DataGridColumnHeader">
+                    <Setter Property="HorizontalContentAlignment" Value="Center" />
+                    <Setter Property="Height" Value="48" />
+                    <Setter Property="FontSize" Value="20" />
+                    <Setter Property="Foreground" Value="White" />
+                    <Setter Property="Background" Value="#2B7EE6" />
+                </Style>
+            </DataGrid.ColumnHeaderStyle>
+            <DataGrid.Columns>
+                <DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                 <DataGridTextColumn Width="0.7*" Header="通讯内容" Binding="{Binding messsge}" /> 
+                <DataGridTextColumn Width="0.1*" Header="日志时间" Binding="{Binding creter_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
+                <!--<DataGridTextColumn Width="0.05*" Header="状态"   Binding="{Binding reqcode}" >  </DataGridTextColumn>-->
+                <DataGridTextColumn Width="0.1*" Header="方法名" Binding="{Binding method}" />
+                <DataGridTextColumn Width="0.1*" Header="备注" Binding="{Binding remark}" />
+
+                <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
+                <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
+
+            </DataGrid.Columns>
+        </DataGrid>
+      
+    </Grid>
+</Window>
diff --git a/shangjian/XGL/Views/ViewLogWin.xaml.cs b/shangjian/XGL/Views/ViewLogWin.xaml.cs
new file mode 100644
index 0000000..53a1805
--- /dev/null
+++ b/shangjian/XGL/Views/ViewLogWin.xaml.cs
@@ -0,0 +1,62 @@
+using CentralControl.DBDAO;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace XGL.Views
+{
+    /// <summary>
+    /// ViewLogWin.xaml 的交互逻辑
+    /// </summary>
+    public partial class ViewLogWin : Window
+    {
+        DBService userDbWareHouse = new DBService();
+        public ViewLogWin()
+        {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.dateStart.SelectedDate = DateTime.Now;
+            GetLogList();
+        }
+
+        private void dgLogInfo_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = (e.Row.GetIndex() + 1).ToString();
+        }
+
+        private void btnQueryLog_Click(object sender, RoutedEventArgs e)
+        {
+            GetLogList();
+        }
+
+        private void GetLogList()
+        {
+            string date = dateStart.SelectedDate.ToString();
+            DataTable dt = userDbWareHouse.GetLogList(date,this.txtKey.Text);
+            if (dt == null) return;
+            this.dgLogInfo.ItemsSource = null;
+            this.dgLogInfo.ItemsSource = dt.DefaultView;
+        }
+
+        private void btnClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+       
+    }
+}
diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj
index 97baa94..503cc8f 100644
--- a/shangjian/XGL/XGL.csproj
+++ b/shangjian/XGL/XGL.csproj
@@ -256,6 +256,7 @@
     <Compile Include="Tools\NetStatusToColorConvert.cs" />
     <Compile Include="Tools\MyValueConverter.cs" />
     <Compile Include="Tools\SyncFlagConverter.cs" />
+    <Compile Include="Tools\UserDatePicker.cs" />
     <Compile Include="UControl\ordertj.xaml.cs">
       <DependentUpon>ordertj.xaml</DependentUpon>
     </Compile>
@@ -379,6 +380,9 @@
     <Compile Include="Views\LanJu_UserRecord.xaml.cs">
       <DependentUpon>LanJu_UserRecord.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ViewLogWin.xaml.cs">
+      <DependentUpon>ViewLogWin.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Web References\AutoUpdate\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -623,6 +627,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ViewLogWin.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs
index 297740a..6e5fbe8 100644
--- a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96FE6E60B8351FE9881A94429F41129A75A6575DC95F871E2ECB804C101688DC"
+#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F55780D9F30F77796BA7EF6A460C8B1C8132E11C574DF72B187C558C3B014DDB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs
index 297740a..6e5fbe8 100644
--- a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96FE6E60B8351FE9881A94429F41129A75A6575DC95F871E2ECB804C101688DC"
+#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F55780D9F30F77796BA7EF6A460C8B1C8132E11C574DF72B187C558C3B014DDB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
index 156b204..d4d6cfd 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36537C5A54FBB9BC69E126C97D248A7D89587462E16D4136074C690C18A5A0AC"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DFF00B4A6E4CE0008A5434520F8E0D43EE84982D77CA80307B94AA9684B8DAC8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -43,7 +43,7 @@ namespace XGL.Views {
     public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 33 "..\..\..\..\Views\LanJu_InOut.xaml"
+        #line 43 "..\..\..\..\Views\LanJu_InOut.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgInOutRecord;
         
@@ -91,7 +91,7 @@ namespace XGL.Views {
             case 2:
             this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 42 "..\..\..\..\Views\LanJu_InOut.xaml"
+            #line 55 "..\..\..\..\Views\LanJu_InOut.xaml"
             this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
             
             #line default
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
index 156b204..d4d6cfd 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36537C5A54FBB9BC69E126C97D248A7D89587462E16D4136074C690C18A5A0AC"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DFF00B4A6E4CE0008A5434520F8E0D43EE84982D77CA80307B94AA9684B8DAC8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -43,7 +43,7 @@ namespace XGL.Views {
     public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 33 "..\..\..\..\Views\LanJu_InOut.xaml"
+        #line 43 "..\..\..\..\Views\LanJu_InOut.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgInOutRecord;
         
@@ -91,7 +91,7 @@ namespace XGL.Views {
             case 2:
             this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 42 "..\..\..\..\Views\LanJu_InOut.xaml"
+            #line 55 "..\..\..\..\Views\LanJu_InOut.xaml"
             this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
             
             #line default
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml
index 7256912..4548845 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
index 669a6c0..f82c924 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C5EBDD54F3BC1368B0F3949337FCB1825696BE8B5BBCE00AE513D6C2844DC6FA"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6CE0F6B014615598B15A3033E96EA2683574AB189AA0B1872F6672D5A8EB0C13"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -50,7 +50,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 217 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnPause;
         
@@ -58,7 +58,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 228 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 238 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnRecover;
         
@@ -66,7 +66,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 315 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 325 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnRefresh;
         
@@ -74,7 +74,15 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 332 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #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 360 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
         
@@ -82,7 +90,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 468 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 499 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window1;
         
@@ -131,7 +139,7 @@ namespace XGL.Views {
             case 2:
             this.btnPause = ((System.Windows.Controls.Button)(target));
             
-            #line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 218 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
             
             #line default
@@ -140,7 +148,7 @@ namespace XGL.Views {
             case 3:
             this.btnRecover = ((System.Windows.Controls.Button)(target));
             
-            #line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 244 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
             
             #line default
@@ -148,7 +156,7 @@ namespace XGL.Views {
             return;
             case 4:
             
-            #line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 265 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -156,7 +164,7 @@ namespace XGL.Views {
             return;
             case 5:
             
-            #line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 286 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default
@@ -164,7 +172,7 @@ namespace XGL.Views {
             return;
             case 6:
             
-            #line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 308 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
@@ -173,30 +181,39 @@ namespace XGL.Views {
             case 7:
             this.btnRefresh = ((System.Windows.Controls.Button)(target));
             
-            #line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 336 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
             
             #line default
             #line hidden
             return;
             case 8:
-            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
+            this.btnCheckLog = ((System.Windows.Controls.Button)(target));
             
-            #line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
+            #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.btnCheckLog.Click += new System.Windows.RoutedEventHandler(this.btnCheckLog_Click);
             
             #line default
             #line hidden
             return;
             case 9:
+            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 400 "..\..\..\..\Views\LanJu_Operator.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            #line 370 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
             
             #line default
             #line hidden
             return;
             case 10:
+            
+            #line 431 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 11:
             this.Window1 = ((System.Windows.Controls.ContentControl)(target));
             return;
             }
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
index 669a6c0..f82c924 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C5EBDD54F3BC1368B0F3949337FCB1825696BE8B5BBCE00AE513D6C2844DC6FA"
+#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6CE0F6B014615598B15A3033E96EA2683574AB189AA0B1872F6672D5A8EB0C13"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -50,7 +50,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 207 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 217 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnPause;
         
@@ -58,7 +58,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 228 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 238 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnRecover;
         
@@ -66,7 +66,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 315 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 325 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnRefresh;
         
@@ -74,7 +74,15 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 332 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #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 360 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
         
@@ -82,7 +90,7 @@ namespace XGL.Views {
         #line hidden
         
         
-        #line 468 "..\..\..\..\Views\LanJu_Operator.xaml"
+        #line 499 "..\..\..\..\Views\LanJu_Operator.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ContentControl Window1;
         
@@ -131,7 +139,7 @@ namespace XGL.Views {
             case 2:
             this.btnPause = ((System.Windows.Controls.Button)(target));
             
-            #line 208 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 218 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnPause.Click += new System.Windows.RoutedEventHandler(this.btnPause_Click);
             
             #line default
@@ -140,7 +148,7 @@ namespace XGL.Views {
             case 3:
             this.btnRecover = ((System.Windows.Controls.Button)(target));
             
-            #line 234 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 244 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnRecover.Click += new System.Windows.RoutedEventHandler(this.btnRecover_Click);
             
             #line default
@@ -148,7 +156,7 @@ namespace XGL.Views {
             return;
             case 4:
             
-            #line 255 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 265 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -156,7 +164,7 @@ namespace XGL.Views {
             return;
             case 5:
             
-            #line 276 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 286 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default
@@ -164,7 +172,7 @@ namespace XGL.Views {
             return;
             case 6:
             
-            #line 298 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 308 "..\..\..\..\Views\LanJu_Operator.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
@@ -173,30 +181,39 @@ namespace XGL.Views {
             case 7:
             this.btnRefresh = ((System.Windows.Controls.Button)(target));
             
-            #line 326 "..\..\..\..\Views\LanJu_Operator.xaml"
+            #line 336 "..\..\..\..\Views\LanJu_Operator.xaml"
             this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
             
             #line default
             #line hidden
             return;
             case 8:
-            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
+            this.btnCheckLog = ((System.Windows.Controls.Button)(target));
             
-            #line 339 "..\..\..\..\Views\LanJu_Operator.xaml"
-            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
+            #line 355 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.btnCheckLog.Click += new System.Windows.RoutedEventHandler(this.btnCheckLog_Click);
             
             #line default
             #line hidden
             return;
             case 9:
+            this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 400 "..\..\..\..\Views\LanJu_Operator.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            #line 370 "..\..\..\..\Views\LanJu_Operator.xaml"
+            this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
             
             #line default
             #line hidden
             return;
             case 10:
+            
+            #line 431 "..\..\..\..\Views\LanJu_Operator.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 11:
             this.Window1 = ((System.Windows.Controls.ContentControl)(target));
             return;
             }
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 b24b37f..c856ea2 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}" "E70FB93CCC7404CAF7C04C26DF24D7CEFDF22C068485FAB9F66BEBD5B943E3BB"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96834934E2770D41EE52C6970A8604F6142011FC58BFEA23BAB4A3B17A3BBAEA"
 //------------------------------------------------------------------------------
 // <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 b24b37f..c856ea2 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}" "E70FB93CCC7404CAF7C04C26DF24D7CEFDF22C068485FAB9F66BEBD5B943E3BB"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96834934E2770D41EE52C6970A8604F6142011FC58BFEA23BAB4A3B17A3BBAEA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
index e098c91..ca659b1 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache and b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
index 9528b23..58c586f 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
+++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-22be839cc0ed09734a65645827becca7206eacaf
+87f39467f535bf496adb97438a039b26400bb381
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
index aeb062e..b5d0f23 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
+++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
@@ -779,3 +779,5 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\ru\Xceed.Wpf
 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\bin\Debug\Resources\lanjuLogoNew.ico
+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\Views\ViewLogWin.baml
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
index f95c593..12cc3cd 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.exe and b/shangjian/XGL/obj/x86/Debug/XGL.exe differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.g.resources b/shangjian/XGL/obj/x86/Debug/XGL.g.resources
index fa6b9dd..f743878 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.g.resources and b/shangjian/XGL/obj/x86/Debug/XGL.g.resources differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.pdb b/shangjian/XGL/obj/x86/Debug/XGL.pdb
index 6a280b1..a8a31e5 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
index e9ff062..e976d68 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
+++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
-57-1649391676
+58-207796803
 3-297253631
-75-2033420257
+77864370360
 1691309784480
-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;
+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\ViewLogWin.xaml;
 
 False
 
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
index 06c1530..efff457 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
+++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
-57-1649391676
+58-207796803
 3-297253631
-76849525282
+78-547651397
 1691309784480
-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;
+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\ViewLogWin.xaml;
 
-False
+True
 
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
index 429f4d7..6fe18f2 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
+++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref
@@ -49,4 +49,5 @@ FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Paused.xa
 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\ViewLogWin.xaml;;