diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a2fb30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+shangjian/.vs/
+shangjian/XGL/obj/
\ No newline at end of file
diff --git a/shangjian/.vs/BL/FileContentIndex/4f6c7661-5fe3-45f3-86e5-6729c4432f3b.vsidx b/shangjian/.vs/BL/FileContentIndex/4f6c7661-5fe3-45f3-86e5-6729c4432f3b.vsidx
deleted file mode 100644
index 35ead97..0000000
Binary files a/shangjian/.vs/BL/FileContentIndex/4f6c7661-5fe3-45f3-86e5-6729c4432f3b.vsidx and /dev/null differ
diff --git a/shangjian/.vs/BL/FileContentIndex/b859bff4-0c49-400b-b0dd-32ff2354207f.vsidx b/shangjian/.vs/BL/FileContentIndex/b859bff4-0c49-400b-b0dd-32ff2354207f.vsidx
deleted file mode 100644
index e2040f5..0000000
Binary files a/shangjian/.vs/BL/FileContentIndex/b859bff4-0c49-400b-b0dd-32ff2354207f.vsidx and /dev/null differ
diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index bb4f40b..218dcf4 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe
index 3e9e5be..111e9b2 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 5468450..521cb9c 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 494839d..4978f04 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 c0dc4ed..84f3206 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 cf48c4f..5300a00 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 409447b..dedf5ee 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 0a26920..66fb336 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 1785bad..9cc2921 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 0d18dc3..0be795d 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 3e9e5be..111e9b2 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 5468450..521cb9c 100644
Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ
diff --git a/shangjian/CommonFunc/Common.cs b/shangjian/CommonFunc/Common.cs
index 121d002..97020d9 100644
--- a/shangjian/CommonFunc/Common.cs
+++ b/shangjian/CommonFunc/Common.cs
@@ -17,7 +17,7 @@ namespace CommonFunc
         public static string ThriftConfigIp = "";
         public static string ThriftConfigPort = "";
         public static string thriftBoxPort = "";
-        
+
         public static string FormBoardThriftPort = "";
         public static string LocatHostMac = "";
         public static string HostIp = "";
@@ -28,7 +28,7 @@ namespace CommonFunc
         public static int noticeserch = 0;
         public static int downloadPDF = 0;
         public static int stoplineset = 0;
-      
+
         /// <summary>
         /// 默认工位
         /// </summary>
@@ -422,5 +422,15 @@ namespace CommonFunc
                 return null;
             }
         }
+
+        /// <summary>
+        /// 获取32位随机码
+        /// </summary>
+        /// <param name="strVarName">名称</param>
+        /// <returns></returns>
+        public static string GetUUID()
+        {
+            return Guid.NewGuid().ToString().Replace("-", "").Substring(0, 32);
+        }
     }
 }
diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll
index 494839d..4978f04 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 c0dc4ed..84f3206 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 0a26920..66fb336 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 1785bad..9cc2921 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 c51aa32..b37bf45 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 494839d..4978f04 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 c0dc4ed..84f3206 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 494839d..4978f04 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 c0dc4ed..84f3206 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 0a26920..66fb336 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 1785bad..9cc2921 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 ddcdd24..6b88238 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 b4408cb..dc53d6d 100644
--- a/shangjian/XGL.Data/DBService/DBService.cs
+++ b/shangjian/XGL.Data/DBService/DBService.cs
@@ -637,10 +637,14 @@ select  a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber
 
         public DataTable GetWetPlanInfo()
         {
-            string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wet.sync_flag,wet.plan_time, workorder_id,bucket_id,bucket_code,material_code,material_name,product_name,wet.shift_desc    
-from pro_wet_material_plan wet
-LEFT JOIN pro_wet_material_plan_detail wetDetail
-on wet.id = wetDetail.wet_material_plan_id "; //where wet.plan_time = '{}'
+            string sql = $@"select wet.id,wet.factory_code,wet.prod_code, wet.sync_flag,wet.plan_time, 
+wetDetail.workorder_id,bucket_id,bucket_code,material_code,material_name,
+wetDetail.product_name,wet.shift_desc,prod_line_code
+from pro_wet_material_plan wet 
+LEFT JOIN pro_wet_material_plan_detail wetDetail 
+on wet.id = wetDetail.wet_material_plan_id
+left join pro_order_workorder workorder on workorder.workorder_id = wetDetail.workorder_id
+"; //where  CONVERT(VARCHAR(10), wet.plan_time , 120)= '2023-08-08'
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
             {
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll
index 494839d..4978f04 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 c0dc4ed..84f3206 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 cf48c4f..5300a00 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 409447b..dedf5ee 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 0a26920..66fb336 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 1785bad..9cc2921 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 783315e..94cd390 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 cf48c4f..5300a00 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 409447b..dedf5ee 100644
Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs b/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs
index 54b9fbe..3c6151a 100644
--- a/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs
+++ b/shangjian/XGL.Model/Model/OrderPrepare/WetMaterialModel.cs
@@ -24,6 +24,7 @@ namespace XGL.Models.Model.OrderPrepare
         public string material_name { get; set; }
         public string product_name { get; set; }
         public string shift_desc { get; set; }
-
+        public string prod_line_code { get; set; }
+        
     }
 }
diff --git a/shangjian/XGL.Model/XGL.Models.csproj b/shangjian/XGL.Model/XGL.Models.csproj
index 828020d..a12c75c 100644
--- a/shangjian/XGL.Model/XGL.Models.csproj
+++ b/shangjian/XGL.Model/XGL.Models.csproj
@@ -109,6 +109,7 @@
     <Compile Include="Model\OffProductInfo.cs" />
     <Compile Include="Model\Orderplan.cs" />
     <Compile Include="Model\OrderPrepare\MaterialPlanModel.cs" />
+    <Compile Include="Model\OrderPrepare\WetMaterialModel.cs" />
     <Compile Include="Model\PlcSetting.cs" />
     <Compile Include="Model\Productinfo.cs" />
     <Compile Include="Model\ResultJson.cs" />
diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll
index 0a26920..66fb336 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 1785bad..9cc2921 100644
Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ
diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
index 5d32b5d..d76314d 100644
--- a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
+++ b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a3981fa2e653446165b1e6d8b53c95e2b7255b1f
+00bbabdd01c605bce5f2d3e47dd2c7484c0442ea
diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll
index 0a26920..66fb336 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 1785bad..9cc2921 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/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml
index 6f1f006..e145155 100644
--- a/shangjian/XGL/FormItem/Main.xaml
+++ b/shangjian/XGL/FormItem/Main.xaml
@@ -365,52 +365,51 @@
                 Width="1920"
                 Height=" 83"
                 HorizontalAlignment="Left"
-                Background="#00479D"
-                Orientation="Horizontal">
-                <Image
-                    Width="250"
+                Orientation="Horizontal" Background="AliceBlue">
+                <StackPanel  Width="210" Orientation="Horizontal" Background="#1C6BCC">
+                    <Image
                     Height="83"
                     Margin="0,0,0,0"
-                    Source="F:\KHD\230620\shangjian\LanJu\Resources\banner.png" />
-                <Label
-                    Canvas.Left="174"
-                    Canvas.Top="19"
+                    Source="/Resources/logo.png" />
+                </StackPanel>
+               
+                <StackPanel Width="1720" Orientation="Horizontal">
+                    <Label
                     Width="300"
                     Height="55"
-                    Margin="5,-20,-5,-20"
+                        Margin="100,0,0,0"
                     Content="榄菊生产操作系统"
                     FontSize="36"
                     FontWeight="Bold"
-                    Foreground="White" />
-                <Image
+                    Foreground="White"/>
+                    <Image
                     Width="40"
-                    Height="40"
-                    Margin="450,-20,-1042,-20"
+                    Height="40" Margin="500,0,0,0"
                     Source="..\Resources\riqi.png" />
-                <Label
-                    x:Name="LabDate"
-                    Canvas.Left="174"
-                    Canvas.Top="19"
-                    Height="55"
-                    Margin="800,-20,-1042,-20"
-                    Content=""
+                    <Label Margin="15"
+                    x:Name="LabDate" 
+                    Height="49"
+                    Content="2023-08-30"
                     FontSize="30"
-                    Foreground="White" />
-                <Image
+                    Foreground="White" VerticalAlignment="Bottom" />
+                      
+                    <Image
                     Width="40"
-                    Height="40"
-                    Margin="1100,-20,-1042,-20"
+                    Height="40" Margin="200,0,0,0"
                     Source="..\Resources\shijian.png" />
-                <Label
-                    x:Name="LabTime"
-                    Canvas.Left="174"
-                    Canvas.Top="19"
-                    Height="55"
-                    Margin="1050,-20,-1184,-20"
-                    Content=""
+                    <Label
+                    x:Name="LabTime" 
+                    Height="49" 
+                    Content="14:53:50"
                     FontSize="30"
-                    Foreground="White" />
+                    Foreground="White" /> 
+                    <StackPanel.Background>
+                        <ImageBrush ImageSource="..\Resources\topblank.png"></ImageBrush>
+                    </StackPanel.Background>
+                </StackPanel>
+               
             </StackPanel>
+            
 
             <!--<StackPanel
                 x:Name="InventoryAreaDown"
diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs
index a8a7294..0ec16c6 100644
--- a/shangjian/XGL/FormItem/Main.xaml.cs
+++ b/shangjian/XGL/FormItem/Main.xaml.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -21,6 +22,7 @@ namespace XGL.FormItem
     {
         public static Main main; 
         Frame frame1 = new Frame() { Content = new Views.LanJu_Index()};
+        Timer timer = new Timer();
         public enum WindowID
         {
             frame1
@@ -31,6 +33,17 @@ namespace XGL.FormItem
             main = this;
             WindowChange(WindowID.frame1);
             CommonFunc.Common.ReadConfig();//读取配置文件
+            timer.Interval = 1000;
+            timer.Elapsed += Timer_Elapsed;
+            timer.Start();
+        }
+
+        private void Timer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            this.Dispatcher.Invoke(
+            new Action(() => { LabDate.Content = DateTime.Now.ToString("yyyy-MM-dd"); LabTime.Content = DateTime.Now.ToString("HH:mm:ss"); }
+            ),
+            System.Windows.Threading.DispatcherPriority.Render) ;
         }
 
         public void WindowChange(WindowID windowID)
diff --git a/shangjian/XGL/LoginPage.xaml b/shangjian/XGL/LoginPage.xaml
index 3e7455f..e410876 100644
--- a/shangjian/XGL/LoginPage.xaml
+++ b/shangjian/XGL/LoginPage.xaml
@@ -18,9 +18,9 @@
             </Rectangle.Fill>
         </Rectangle>
         <!--<Image Source="Images/home.png" Width="100" Height="100" VerticalAlignment="Top" Margin="20"></Image>-->
-        <Label Foreground="White" FontSize="30"  HorizontalAlignment="Center" VerticalAlignment="Top"  Margin="0,30,0,0">
-            <Label.Content> 
-                <Image Source="/Resources/logo.jpg" Width="160" Height="50"/> 
+        <Label Foreground="White" FontSize="30"  HorizontalAlignment="Center" VerticalAlignment="Top"  Margin="0,10,0,0">
+            <Label.Content>
+                <Image Source="/Resources/logo.png" Width="160" Height="50"/> 
             </Label.Content>
         </Label>
         <Rectangle Width="280" Height="240" Fill="White" VerticalAlignment="Bottom" Margin="0,100" RadiusY="19.112" RadiusX="19.112">
diff --git a/shangjian/XGL/LoginPage.xaml.cs b/shangjian/XGL/LoginPage.xaml.cs
index 05e99d7..acfb4f4 100644
--- a/shangjian/XGL/LoginPage.xaml.cs
+++ b/shangjian/XGL/LoginPage.xaml.cs
@@ -153,41 +153,41 @@ namespace XGL
                     this.Close();
                     break;
                 case 0:
-                    //CustomMessageBox.Show("登录失败", CustomMessageBoxIcon.Error);
-                    this.Dispatcher.Invoke(
-                    new Action(() => { zzdl.Content = "登录失败"; zzdl.Foreground = Brushes.Red; }
-                    ),
-                    System.Windows.Threading.DispatcherPriority.Render) ;
+                    CustomMessageBox.Show("登录失败", CustomMessageBoxIcon.Error);
+                    //this.Dispatcher.Invoke(
+                    //new Action(() => { zzdl.Content = "登录失败"; zzdl.Foreground = Brushes.Red; }
+                    //),
+                    //System.Windows.Threading.DispatcherPriority.Render) ;
               
                     break;
                 case -1:
-                    this.Dispatcher.Invoke(
-                    new Action(() => { zzdl.Content = "账号或密码错误"; zzdl.Foreground = Brushes.Red; }
-                    ),
-                    System.Windows.Threading.DispatcherPriority.Render);
-                    //CustomMessageBox.Show("账号或密码错误", CustomMessageBoxIcon.Error);
+                    //this.Dispatcher.Invoke(
+                    //new Action(() => { zzdl.Content = "账号或密码错误"; zzdl.Foreground = Brushes.Red; }
+                    //),
+                    //System.Windows.Threading.DispatcherPriority.Render);
+                    CustomMessageBox.Show("账号或密码错误", CustomMessageBoxIcon.Error);
                     break;
                 case -2:
-                    zzdl.Content = "请输入密码";
-                    zzdl.Foreground = Brushes.Red;
-                    //CustomMessageBox.Show("请输入密码", CustomMessageBoxIcon.Error);
+                    //zzdl.Content = "请输入密码";
+                    //zzdl.Foreground = Brushes.Red;
+                    CustomMessageBox.Show("请输入密码", CustomMessageBoxIcon.Error);
                     break;
                 case -3:
-                    zzdl.Content = "请输入账号";
-                    zzdl.Foreground = Brushes.Red;
-                    //CustomMessageBox.Show("请输入账号", CustomMessageBoxIcon.Error);
+                    //zzdl.Content = "请输入账号";
+                    //zzdl.Foreground = Brushes.Red;
+                    CustomMessageBox.Show("请输入账号", CustomMessageBoxIcon.Error);
                     break;
                 case -4:
-                    zzdl.Content = "加载菜单异常，请重试";
-                    zzdl.Foreground = Brushes.Red;
-                    //CustomMessageBox.Show("加载菜单异常，请重试", CustomMessageBoxIcon.Error);
+                    //zzdl.Content = "加载菜单异常，请重试";
+                    //zzdl.Foreground = Brushes.Red;
+                    CustomMessageBox.Show("加载菜单异常，请重试", CustomMessageBoxIcon.Error);
                     break;
                 case -5:
-                    this.Dispatcher.Invoke(
-                 new Action(() =>  zzdl.Content = "登录异常，请重试"
-                 ),
-                 System.Windows.Threading.DispatcherPriority.Render);
-                    //CustomMessageBox.Show("登录异常，请重试", CustomMessageBoxIcon.Error);
+                 //   this.Dispatcher.Invoke(
+                 //new Action(() =>  zzdl.Content = "登录异常，请重试"
+                 //),
+                 //System.Windows.Threading.DispatcherPriority.Render);
+                    CustomMessageBox.Show("登录异常，请重试", CustomMessageBoxIcon.Error);
                     break;
             }
             dldh.IsActive = false;
diff --git a/shangjian/XGL/Properties/Resources.resx b/shangjian/XGL/Properties/Resources.resx
index ac2ae87..875d20d 100644
--- a/shangjian/XGL/Properties/Resources.resx
+++ b/shangjian/XGL/Properties/Resources.resx
@@ -254,6 +254,6 @@
     <value>..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/shangjian/XGL/Resources/logo.jpg b/shangjian/XGL/Resources/logo.jpg
deleted file mode 100644
index 25f8209..0000000
Binary files a/shangjian/XGL/Resources/logo.jpg and /dev/null differ
diff --git a/shangjian/XGL/Resources/logo.png b/shangjian/XGL/Resources/logo.png
new file mode 100644
index 0000000..9e7d3c8
Binary files /dev/null and b/shangjian/XGL/Resources/logo.png differ
diff --git a/shangjian/XGL/Resources/startOrder.jpg b/shangjian/XGL/Resources/startOrder.jpg
new file mode 100644
index 0000000..365d865
Binary files /dev/null and b/shangjian/XGL/Resources/startOrder.jpg differ
diff --git a/shangjian/XGL/Resources/topblank.png b/shangjian/XGL/Resources/topblank.png
new file mode 100644
index 0000000..fdc931d
Binary files /dev/null and b/shangjian/XGL/Resources/topblank.png differ
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml
index f241e03..b360a9e 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml
@@ -23,9 +23,9 @@
                                     StrokeThickness="1" >
                                     <Ellipse.Fill>
                                         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FF2281D1"></GradientStop>
-                                            <GradientStop Color="#FF34268A" Offset="1"></GradientStop>
+                                            <GradientStop Color="#FF34268A" Offset="0.1"></GradientStop>
                                             <GradientStop Color="#FF33288B" Offset="0.5"></GradientStop>
+                                            <GradientStop Color="#FF2281D1" Offset="0.9"></GradientStop>
                                         </LinearGradientBrush>
                                     </Ellipse.Fill>
                                 </Ellipse>
@@ -110,12 +110,19 @@
                         <DataGridTextColumn Width="300" Header="完成时间" />
                     </DataGrid.Columns>
                 </DataGrid>
+                <Button Grid.Row="1" Grid.Column="1" Click="btnStartOrders_Click">
+                    <Button.Template>
+                        <ControlTemplate>
+                            <Image Width="250" Height="250" Margin="0,0,0,0" Source="/Resources/startOrder.jpg" />  
+                        </ControlTemplate> 
+                    </Button.Template>
+                </Button>
 
-                <Button
+                <!--<Button
                     x:Name="btnStartOrders"
                     Grid.Row="1"
                     Foreground="White"
-                    FontSize="18"
+                    FontSize="28"
                     Grid.Column="1"
                     Width="250"
                     Height="250"
@@ -124,7 +131,7 @@
                     Content="开始工单"
                     Style="{StaticResource RoundButton}" Click="btnStartOrders_Click">
                
-                </Button>
+                </Button>-->
 
                 <Label
                     Grid.Row="2"
@@ -250,7 +257,11 @@
                             <DataGridTextColumn
                                 Width="*"
                                 Binding="{Binding shift_desc}"
-                                Header="班次" />
+                                Header="班次" /> 
+                            <DataGridTextColumn
+                                Width="*"
+                                Binding="{Binding prod_line_code}"
+                                Header="成型机" />
                         </DataGrid.Columns>
                     </DataGrid>
                 </ScrollViewer>
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
index 65f74aa..7f352d3 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
@@ -38,6 +38,7 @@ namespace XGL.Views
         List<WetMaterialModel> wetList = new List<WetMaterialModel>();
         WetMaterialModel wet = new WetMaterialModel();
         string messageOrderCode = "";
+        DataTable dt;
         /// <summary>
         /// <summary>
         /// 获取主页显示订单
@@ -50,8 +51,8 @@ namespace XGL.Views
             {
                 //modelWareHouse = new List<WorkOrder>();
                 //userDbWareHouse = new DBService();
-                var Items = userDbWareHouse.GetWetPlanInfo();
-                foreach (DataRow i in Items.Rows)
+                dt = userDbWareHouse.GetWetPlanInfo();
+                foreach (DataRow i in dt.Rows)
                 {
                     wet.id = i["id"].ToString();
                     wet.workorder_id = i["workorder_id"].ToString();
@@ -61,6 +62,7 @@ namespace XGL.Views
                     wet.plan_time = Convert.ToDateTime(i["plan_time"].ToString());
                     wet.bucket_code = i["bucket_code"].ToString();
                     wet.shift_desc = i["shift_desc"].ToString();
+                    wet.prod_line_code = i["prod_line_code"].ToString();
                     wetList.Add(wet);
                     //    list_modelWareHouse.WorkOrderCode = i["WorkOrderCode"].ToString();
                     //    list_modelWareHouse.OrderCode = i["OrderCode"].ToString();
@@ -103,11 +105,31 @@ namespace XGL.Views
                 CustomMessageBox.Show("该工单未准备好，请稍后再试！", CustomMessageBoxIcon.Warning);
                 return;
             }
+
             string apiUrl = "http://example.com/api/endpoint";
 
             string jsonContent = "{\"key1\":\"value1\",\"key2\":\"value2\"}";
             MaterialPlanModel materialPlanModel = new MaterialPlanModel();
-            //materialPlanModel.reqCode = CommonFunc.Common.
+            skuInfo sku = new skuInfo();
+            List<WetMaterialModel> listWetMaterial = Utils.ToDataList<WetMaterialModel>(dt);
+            List<unloadNoInfo> unloadNoInfoList = new List<unloadNoInfo>();
+            //根据湿料计划、成型机分组
+            var listChengXingji = listWetMaterial.GroupBy(a => new { a.id,a.prod_line_code});
+
+            var list = listWetMaterial.GroupBy(a=>a.prod_line_code);
+            foreach (var item in listChengXingji)
+            {
+                unloadNoInfo unloadNoInfo = new unloadNoInfo();
+                unloadNoInfo.unloadNo = (WorkOrder.SelectedItem as WetMaterialModel).bucket_code;
+                unloadNoInfoList.Add(unloadNoInfo);
+            }
+          
+            materialPlanModel.reqCode = CommonFunc.Common.GetUUID();
+            materialPlanModel.reqTime = DateTime.Now.ToString();
+            materialPlanModel.planNo = orderID;
+            sku.sku = "";
+            sku.loadNo = "";
+
             RestHelper restClient = new RestHelper();
             var response =  restClient.PostAsync(apiUrl, jsonContent);
 
diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj
index 833ca1c..39a3bfe 100644
--- a/shangjian/XGL/XGL.csproj
+++ b/shangjian/XGL/XGL.csproj
@@ -921,7 +921,13 @@
     <Resource Include="Resources\zaijubianma.png" />
     <Resource Include="Resources\zaijudaoweizhuangtai.png" />
     <Resource Include="Resources\上件操作.png" />
-    <Resource Include="Resources\logo.jpg" />
+    <Resource Include="Resources\alert.png" />
+    <Resource Include="Resources\Error.png" />
+    <Resource Include="Resources\question.png" />
+    <Resource Include="Resources\Success.png" />
+    <Resource Include="Resources\logo.png" />
+    <Resource Include="Resources\topblank.png" />
+    <Resource Include="Resources\startOrder.jpg" />
     <Content Include="snap7.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.exe b/shangjian/XGL/bin/x86/Debug/CentralControl.exe
index 3e9e5be..111e9b2 100644
Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.exe and b/shangjian/XGL/bin/x86/Debug/CentralControl.exe differ
diff --git a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb
index 5468450..521cb9c 100644
Binary files a/shangjian/XGL/bin/x86/Debug/CentralControl.pdb and b/shangjian/XGL/bin/x86/Debug/CentralControl.pdb differ
diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll
index 494839d..4978f04 100644
Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL/bin/x86/Debug/CommonFunc.dll differ
diff --git a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb
index c0dc4ed..84f3206 100644
Binary files a/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL/bin/x86/Debug/CommonFunc.pdb differ
diff --git a/shangjian/XGL/bin/x86/Debug/LogInfo/2023-08-30.TXT b/shangjian/XGL/bin/x86/Debug/LogInfo/2023-08-30.TXT
new file mode 100644
index 0000000..475d99a
--- /dev/null
+++ b/shangjian/XGL/bin/x86/Debug/LogInfo/2023-08-30.TXT
@@ -0,0 +1,128 @@
+ ��ʱ�䡿:2023-08-30 10:23:24,512
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 30840 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��403��
+ ����־���ݡ�:==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginUser]
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 10:23:24,570
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 30840 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��403��
+ ����־���ݡ�:==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginpwd]
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:36,930
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 65168 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��403��
+ ����־���ݡ�:==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginUser]
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:36,997
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 65168 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��403��
+ ����־���ݡ�:==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginpwd]
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:46,100
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 65168 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��364��
+ ����־���ݡ�:��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginUser
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:46,111
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 65168 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��364��
+ ����־���ݡ�:��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginpwd
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:46,552
+ ������:WARN
+ ��������:CommonFunc.SqlServerDBHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\SqlServerDbHelper.cs ��54��
+ ����־���ݡ�:�������ݿ�ʱ�����쳣���ͻ����޷��������ӣ���Ϊ�ڵ�¼ǰ���ӳ�ʼ�������з������󡣿��ܵ�ԭ�����: �ͻ��˳������ӵ� SQL Server �İ汾����֧��; ��������æ���޷�����������; ���ߣ��������ϴ�����Դ����(�ڴ治����Ѵﵽ�����������������)�� (provider: TCP Provider, error: 0 - Զ������ǿ�ȹر���һ�����е����ӡ�)
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:46,577
+ ������:WARN
+ ��������:CommonFunc.SqlServerDBHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\SqlServerDbHelper.cs ��110��
+ ����־���ݡ�:ִ�в�ѯ�����쳣���ͻ����޷��������ӣ���Ϊ�ڵ�¼ǰ���ӳ�ʼ�������з������󡣿��ܵ�ԭ�����: �ͻ��˳������ӵ� SQL Server �İ汾����֧��; ��������æ���޷�����������; ���ߣ��������ϴ�����Դ����(�ڴ治����Ѵﵽ�����������������)�� (provider: TCP Provider, error: 0 - Զ������ǿ�ȹر���һ�����е����ӡ�)
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:46,585
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\LoginPage.xaml.cs ��123��
+ ����־���ݡ�:��¼�쳣:�޷��ҵ��� 0��
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:40:46,586
+ ������:INFO
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\LoginPage.xaml.cs ��127��
+ ����־���ݡ�:��¼ʱ��0
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:41:09,805
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 65168 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��364��
+ ����־���ݡ�:��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginUser
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:41:09,806
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 65168 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Common.cs ��364��
+ ����־���ݡ�:��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginpwd
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:41:10,468
+ ������:WARN
+ ��������:CommonFunc.SqlServerDBHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\SqlServerDbHelper.cs ��54��
+ ����־���ݡ�:�������ݿ�ʱ�����쳣���ѳɹ���������������ӣ������ڵ�¼ǰ�������ڼ䷢������ (provider: TCP Provider, error: 0 - ָ�������������ٿ��á�)
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:41:10,477
+ ������:WARN
+ ��������:CommonFunc.SqlServerDBHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\SqlServerDbHelper.cs ��110��
+ ����־���ݡ�:ִ�в�ѯ�����쳣���ѳɹ���������������ӣ������ڵ�¼ǰ�������ڼ䷢������ (provider: TCP Provider, error: 0 - ָ�������������ٿ��á�)
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:41:10,484
+ ������:ERROR
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\LoginPage.xaml.cs ��123��
+ ����־���ݡ�:��¼�쳣:�޷��ҵ��� 0��
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
+ ��ʱ�䡿:2023-08-30 16:41:10,485
+ ������:INFO
+ ��������:CommonFunc.LogHelper
+ ���߳�ID��: 32836 
+ ���ļ���ַ��:D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\LoginPage.xaml.cs ��127��
+ ����־���ݡ�:��¼ʱ��0
+ ���ռ���ϸ���� 
+---------------------------------------------------------------------------------------------------------------
diff --git a/shangjian/XGL/bin/x86/Debug/LogInfo/ErrorInfoLog/ERROR_2023-08-30.TXT b/shangjian/XGL/bin/x86/Debug/LogInfo/ErrorInfoLog/ERROR_2023-08-30.TXT
new file mode 100644
index 0000000..ce43cc2
--- /dev/null
+++ b/shangjian/XGL/bin/x86/Debug/LogInfo/ErrorInfoLog/ERROR_2023-08-30.TXT
@@ -0,0 +1,10 @@
+[2023-08-30 10:23:24,512][ERROR] ==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginUser]
+[2023-08-30 10:23:24,570][ERROR] ==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginpwd]
+[2023-08-30 16:40:36,930][ERROR] ==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginUser]
+[2023-08-30 16:40:36,997][ERROR] ==========>����ȡֵ�����������ؼ��ֲ����ֵ��С�   [loginpwd]
+[2023-08-30 16:40:46,100][ERROR] ��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginUser
+[2023-08-30 16:40:46,111][ERROR] ��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginpwd
+[2023-08-30 16:40:46,585][ERROR] ��¼�쳣:�޷��ҵ��� 0��
+[2023-08-30 16:41:09,805][ERROR] ��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginUser
+[2023-08-30 16:41:09,806][ERROR] ��D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\x86\Debug\\System.ini���Ѿ�������ͬ�������loginpwd
+[2023-08-30 16:41:10,484][ERROR] ��¼�쳣:�޷��ҵ��� 0��
diff --git a/shangjian/XGL/bin/x86/Debug/LogInfo/MachineWainingLog/MWL_2023-08-30.TXT b/shangjian/XGL/bin/x86/Debug/LogInfo/MachineWainingLog/MWL_2023-08-30.TXT
new file mode 100644
index 0000000..dec2e21
--- /dev/null
+++ b/shangjian/XGL/bin/x86/Debug/LogInfo/MachineWainingLog/MWL_2023-08-30.TXT
@@ -0,0 +1,4 @@
+[2023-08-30 16:40:46,552] �������ݿ�ʱ�����쳣���ͻ����޷��������ӣ���Ϊ�ڵ�¼ǰ���ӳ�ʼ�������з������󡣿��ܵ�ԭ�����: �ͻ��˳������ӵ� SQL Server �İ汾����֧��; ��������æ���޷�����������; ���ߣ��������ϴ�����Դ����(�ڴ治����Ѵﵽ�����������������)�� (provider: TCP Provider, error: 0 - Զ������ǿ�ȹر���һ�����е����ӡ�)
+[2023-08-30 16:40:46,577] ִ�в�ѯ�����쳣���ͻ����޷��������ӣ���Ϊ�ڵ�¼ǰ���ӳ�ʼ�������з������󡣿��ܵ�ԭ�����: �ͻ��˳������ӵ� SQL Server �İ汾����֧��; ��������æ���޷�����������; ���ߣ��������ϴ�����Դ����(�ڴ治����Ѵﵽ�����������������)�� (provider: TCP Provider, error: 0 - Զ������ǿ�ȹر���һ�����е����ӡ�)
+[2023-08-30 16:41:10,468] �������ݿ�ʱ�����쳣���ѳɹ���������������ӣ������ڵ�¼ǰ�������ڼ䷢������ (provider: TCP Provider, error: 0 - ָ�������������ٿ��á�)
+[2023-08-30 16:41:10,477] ִ�в�ѯ�����쳣���ѳɹ���������������ӣ������ڵ�¼ǰ�������ڼ䷢������ (provider: TCP Provider, error: 0 - ָ�������������ٿ��á�)
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll
index cf48c4f..5300a00 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Data.dll differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb
index 409447b..dedf5ee 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Data.pdb differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll
index 0a26920..66fb336 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL/bin/x86/Debug/XGL.Models.dll differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb
index 1785bad..9cc2921 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.Models.pdb differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.exe b/shangjian/XGL/bin/x86/Debug/XGL.exe
index 628a361..0c81b8c 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.exe and b/shangjian/XGL/bin/x86/Debug/XGL.exe differ
diff --git a/shangjian/XGL/bin/x86/Debug/XGL.pdb b/shangjian/XGL/bin/x86/Debug/XGL.pdb
index f1ae9ef..92fb5bf 100644
Binary files a/shangjian/XGL/bin/x86/Debug/XGL.pdb and b/shangjian/XGL/bin/x86/Debug/XGL.pdb differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml
index cb99f23..b871565 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml
index 5ddf600..eb0a318 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml
index 0daa801..baf7da4 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml
index 6a3c949..794a84c 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml
index 7349842..7fcf357 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml
index 140841d..768a92e 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml b/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml
index b288ed5..359c2d7 100644
Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml and b/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs
index 6ca22c7..d064e6b 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}" "517FA39B851EB2D816E9F37D2B5DE6F6045B3C7898F5907DD695601BC0E3F056"
+#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "37C438E1EAF0683518728F4D4D56C558F66FDFE8AAD314B65D85A076FD054124"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -65,7 +65,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 391 "..\..\..\..\FormItem\Main.xaml"
+        #line 390 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label LabDate;
         
@@ -73,7 +73,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 405 "..\..\..\..\FormItem\Main.xaml"
+        #line 401 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label LabTime;
         
@@ -81,7 +81,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 452 "..\..\..\..\FormItem\Main.xaml"
+        #line 451 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel DownStart;
         
@@ -89,7 +89,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 474 "..\..\..\..\FormItem\Main.xaml"
+        #line 473 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnFault;
         
@@ -155,7 +155,7 @@ namespace XGL.FormItem {
             case 8:
             this.btnFault = ((System.Windows.Controls.Button)(target));
             
-            #line 479 "..\..\..\..\FormItem\Main.xaml"
+            #line 478 "..\..\..\..\FormItem\Main.xaml"
             this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
             
             #line default
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 6ca22c7..d064e6b 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}" "517FA39B851EB2D816E9F37D2B5DE6F6045B3C7898F5907DD695601BC0E3F056"
+#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "37C438E1EAF0683518728F4D4D56C558F66FDFE8AAD314B65D85A076FD054124"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -65,7 +65,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 391 "..\..\..\..\FormItem\Main.xaml"
+        #line 390 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label LabDate;
         
@@ -73,7 +73,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 405 "..\..\..\..\FormItem\Main.xaml"
+        #line 401 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label LabTime;
         
@@ -81,7 +81,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 452 "..\..\..\..\FormItem\Main.xaml"
+        #line 451 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel DownStart;
         
@@ -89,7 +89,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 474 "..\..\..\..\FormItem\Main.xaml"
+        #line 473 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnFault;
         
@@ -155,7 +155,7 @@ namespace XGL.FormItem {
             case 8:
             this.btnFault = ((System.Windows.Controls.Button)(target));
             
-            #line 479 "..\..\..\..\FormItem\Main.xaml"
+            #line 478 "..\..\..\..\FormItem\Main.xaml"
             this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
             
             #line default
diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.baml b/shangjian/XGL/obj/x86/Debug/LoginPage.baml
index 9d2c0a2..c3a7d1f 100644
Binary files a/shangjian/XGL/obj/x86/Debug/LoginPage.baml and b/shangjian/XGL/obj/x86/Debug/LoginPage.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs b/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs
index 9a8ba60..127a288 100644
--- a/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/LoginPage.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3B55C34DBCEC4FCB00DB74F17B3838B08AA108F2A66222C8C100083A4FE01020"
+#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E1E2B77B64905595950267B326E43AFC69E8ABE897825376C0C09897F849D97"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs b/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs
index 9a8ba60..127a288 100644
--- a/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/LoginPage.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3B55C34DBCEC4FCB00DB74F17B3838B08AA108F2A66222C8C100083A4FE01020"
+#pragma checksum "..\..\..\LoginPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E1E2B77B64905595950267B326E43AFC69E8ABE897825376C0C09897F849D97"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/shangjian/XGL/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll b/shangjian/XGL/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll
index 252025d..f32923a 100644
Binary files a/shangjian/XGL/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/shangjian/XGL/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml
index 5fa205e..7fa91f9 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml
index 8ab3da9..31d3daa 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml
index 8264718..1b0b9f4 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml
index a9db10c..2d79579 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml
index f0ae121..1b218a7 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml
index 1733454..3cd45bc 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml
index 1ea3a4a..4b25abb 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml
index 919b579..e3002bd 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml
index 548f245..ba81895 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml
index 1485100..d48c235 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml
index 4ea30ee..e1a1e89 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml
index 2d32618..4afc1eb 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml
index b54839f..d40ec6a 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml
index b09fcdd..fa47ee3 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml
index b534c80..a3dc13a 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml
index d670548..5aa59f3 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml
index 05ff5da..85f3eae 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml and b/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml b/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml
index 58c2282..416c547 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml and b/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml
index f27e25d..0cff89b 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml and b/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml
index 8a9caba..5751cae 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml and b/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml
index 5ba7137..1666c86 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml and b/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml
index 8ca0f68..874b1b3 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml and b/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml
index 7d20874..0197505 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml and b/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml
index 5a645ec..384927e 100644
Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml and b/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml
index 408c583..75cd6fb 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml
index 98b8faf..0143c69 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml
index 24b8dff..2cc843c 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml
index ea93df5..2330828 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml
index 4d9b501..538b13b 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml
index 1f551f3..62cff6d 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml
index bbff224..0775c41 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml
index 334410f..79da20d 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml
index d28b9c5..d2edfd9 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml differ
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 c213f64..b8e08ff 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}" "5523EF3D093A5D187296B68ABADA556876B49F5B262B607C098898654B6F61B2"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "79641976A1D3FBA064588F5FBE49D6B549B2778A4A4E294C45C3887DB50008EF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -41,15 +41,7 @@ namespace XGL.Views {
     public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 115 "..\..\..\..\Views\LanJu_Prepare.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnStartOrders;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 148 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        #line 155 "..\..\..\..\Views\LanJu_Prepare.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid WorkOrder;
         
@@ -95,10 +87,9 @@ namespace XGL.Views {
             #line hidden
             return;
             case 2:
-            this.btnStartOrders = ((System.Windows.Controls.Button)(target));
             
-            #line 125 "..\..\..\..\Views\LanJu_Prepare.xaml"
-            this.btnStartOrders.Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
+            #line 113 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
             
             #line default
             #line hidden
@@ -121,7 +112,7 @@ namespace XGL.Views {
             {
             case 4:
             
-            #line 181 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 189 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
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 c213f64..b8e08ff 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}" "5523EF3D093A5D187296B68ABADA556876B49F5B262B607C098898654B6F61B2"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "79641976A1D3FBA064588F5FBE49D6B549B2778A4A4E294C45C3887DB50008EF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -41,15 +41,7 @@ namespace XGL.Views {
     public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 115 "..\..\..\..\Views\LanJu_Prepare.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnStartOrders;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 148 "..\..\..\..\Views\LanJu_Prepare.xaml"
+        #line 155 "..\..\..\..\Views\LanJu_Prepare.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid WorkOrder;
         
@@ -95,10 +87,9 @@ namespace XGL.Views {
             #line hidden
             return;
             case 2:
-            this.btnStartOrders = ((System.Windows.Controls.Button)(target));
             
-            #line 125 "..\..\..\..\Views\LanJu_Prepare.xaml"
-            this.btnStartOrders.Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
+            #line 113 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
             
             #line default
             #line hidden
@@ -121,7 +112,7 @@ namespace XGL.Views {
             {
             case 4:
             
-            #line 181 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 189 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml
index fc9a82c..cf7dbba 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml
index 44c69b2..895043b 100644
Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.Properties.Resources.resources b/shangjian/XGL/obj/x86/Debug/XGL.Properties.Resources.resources
index bcaae37..b4a07ff 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.Properties.Resources.resources and b/shangjian/XGL/obj/x86/Debug/XGL.Properties.Resources.resources differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
index 3754308..4b71a40 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.GenerateResource.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.GenerateResource.cache
index 25a106c..ba0b41c 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.csproj.GenerateResource.cache and b/shangjian/XGL/obj/x86/Debug/XGL.csproj.GenerateResource.cache differ
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
index 628a361..0c81b8c 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 d01f65d..6b29902 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 f1ae9ef..92fb5bf 100644
Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ