diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index 6bcb8ff..a1c6d8e 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 5ef5d0e..f09b8e0 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 2cbfa0d..1709369 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 3e2d58f..8919ed4 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 64bb384..bc39472 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 11572aa..48973fc 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 d47fdf1..a7ec276 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 47952cd..3aceff4 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 c8b9e8a..5597ad9 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 7ac9fc2..b83d144 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 26e76af..8945932 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 a301673..0fc0f33 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 5ef5d0e..f09b8e0 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 2cbfa0d..1709369 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 3e2d58f..8919ed4 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 64bb384..bc39472 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 47952cd..3aceff4 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 c8b9e8a..5597ad9 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 f3b56d6..45ea18f 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 3e2d58f..8919ed4 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 64bb384..bc39472 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 3e2d58f..8919ed4 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 64bb384..bc39472 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 47952cd..3aceff4 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 c8b9e8a..5597ad9 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 50e2af6..b13a17e 100644
Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ
diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs
index 8daa511..736a8ef 100644
--- a/shangjian/XGL.Data/DBService/FormingMachineService.cs
+++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs
@@ -73,9 +73,9 @@ ORDER BY
         /// <param name="bdt"></param>
         /// <param name="edt"></param>
         /// <returns></returns>
-        public string getnumber(string order, string devicecode)
+        public string getnumber(string order, string devicecode,string shetl)
         {
-            string sql = $@"SELECT COUNT(*) FROM pro_rfid_process_detail WHERE workorder_code='{order}' AND machine_code='{devicecode}'";
+            string sql = $@"SELECT COUNT(*) FROM mes_material_transfer_result WHERE equipmentCode='{order}' and work_date='{devicecode}' and shift_id='{shetl}' and rfid_status='1'";
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0)
diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll
index 3e2d58f..8919ed4 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 64bb384..bc39472 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 11572aa..48973fc 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 d47fdf1..a7ec276 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 47952cd..3aceff4 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 c8b9e8a..5597ad9 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 4f2caf2..b1ebc9a 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 11572aa..48973fc 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 d47fdf1..a7ec276 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 47952cd..3aceff4 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 c8b9e8a..5597ad9 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 47952cd..3aceff4 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 c8b9e8a..5597ad9 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 7ac9fc2..b83d144 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 26e76af..8945932 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 7ac9fc2..b83d144 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 26e76af..8945932 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..896cda7 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -10,11 +10,11 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="1000" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="C6" />
+		<add key="DeviceCode" value="C3" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
 		<add key="ClientMode" value="0" />
 		<add key="SerialPort" value="COM5" />
-		<add key="DryingHouseList" value="H1,H2,H3" />
+		<add key="DryingHouseList" value="H14" />
 	 
 		<!--线体编码-->
 		<add key="LineCode" value="101" /> 
diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml
index 1a192b3..5f89042 100644
--- a/shangjian/XGL/FormItem/Main.xaml
+++ b/shangjian/XGL/FormItem/Main.xaml
@@ -562,7 +562,11 @@
                         FontSize="20px"
                         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"  > 
+                    
+                    <Button  BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent"  FontSize="26" Height="40" Width="50" HorizontalAlignment="Left" x:Name="notsos"    Margin="900,4,0,2" ToolTip="关闭报警" Click="notsos_Click"  >
+                        <Image Source="..\Resources\nitsos.png" />
+                    </Button>
+                    <Button  BorderThickness="1" BorderBrush="CornflowerBlue" Visibility="Visible" Background="Transparent"  FontSize="26" Height="40" Width="50" HorizontalAlignment="Left" x:Name="btnZXH"    Margin="200,4,0,2" ToolTip="最小化" Click="btnZXH_Click"  > 
                             <Image Source="..\Resources\zxh.png" /> 
                     </Button>
                     <Button
diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs
index 4b0da96..35bcf25 100644
--- a/shangjian/XGL/FormItem/Main.xaml.cs
+++ b/shangjian/XGL/FormItem/Main.xaml.cs
@@ -293,6 +293,15 @@ namespace XGL.FormItem
             serialHelper.buzzerOff();
             serialHelper.ComOff();
         }
+
+        private void notsos_Click(object sender, RoutedEventArgs e)
+        {
+            //取消报警
+            serialHelper.ComOn();
+            serialHelper.redLightOff();
+            serialHelper.buzzerOff();
+            serialHelper.ComOff();
+        }
     }
   
 }
diff --git a/shangjian/XGL/Resources/nitsos.png b/shangjian/XGL/Resources/nitsos.png
new file mode 100644
index 0000000..4146ee0
Binary files /dev/null and b/shangjian/XGL/Resources/nitsos.png differ
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
index 3375395..35cad42 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs
@@ -99,7 +99,8 @@ namespace XGL.Views
             timerDeciveState.Start();
             GetWorkOrderInfo();
         }
-
+        string isbaiye;
+        string plantime;
         private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e)
         {
             try
@@ -120,10 +121,11 @@ namespace XGL.Views
                     order.product_code = i["product_code"].ToString();
                     order.car_num = Convert.ToInt32(i["car_num"].ToString());
                     order.plan_time = Convert.ToDateTime(i["plan_time"].ToString());
+                    plantime=order.plan_time.ToString();
                     order.status = i["status"].ToString();
                     order.process_id = i["route_code"].ToString();
                     order.attr1 = i["attr1"].ToString();
-                   string isbaiye= i["shift_id"].ToString();
+                    isbaiye= i["shift_id"].ToString();
                     if (isbaiye=="5")
                     {
                         order.isbai = "白班";
@@ -137,7 +139,8 @@ namespace XGL.Views
                 }
                 foreach (var item in orderList)
                 {
-                    string bumb = formingMachineService.getnumber(item.workorder_code, deviceCode);
+                    string bumb = formingMachineService.getnumber(deviceCode, plantime, isbaiye);
+                    LogHelper.instance.log.Info($@"当前查询到当前机台{deviceCode}工作数量为{bumb}");
                     item.totalCount = bumb;
                 }
                 if (orderList != null)
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml b/shangjian/XGL/Views/LanJu_Prepare.xaml
index e2c514f..10dbd66 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml
@@ -348,11 +348,11 @@
                                 Header="订单编码" />
 
                             <DataGridTextColumn Visibility="Visible"
-                                Width="350"
+                                Width="250"
                                 Binding="{Binding workorder_code}"
                                 Header="订单码" />
                             <DataGridTextColumn
-                                Width="450"
+                                Width="150"
                                 Binding="{Binding product_name}"
                                 Header="产品名称" />
                             <DataGridTextColumn
@@ -366,7 +366,7 @@
                                 Header="料罐编码" />
                           
                             <DataGridTextColumn
-                                Width="80"
+                                Width="750"
                                 Binding="{Binding prod_line_code}"
                                 Header="设备" />
                             <DataGridTextColumn
@@ -383,7 +383,11 @@
                                     </Style>
                                 </DataGridTextColumn.ElementStyle>
                             </DataGridTextColumn>
-                            <DataGridTextColumn
+                        <DataGridTextColumn 
+                                Width="50"
+                                Binding="{Binding shift_desc}"
+                                Header="班次" />
+                        <DataGridTextColumn
                                 Width="200"
                                 Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
                                 Header="工单时间" />
@@ -391,10 +395,7 @@
                                 Width="250"
                                 Binding="{Binding id}"
                                 Header="计划编码" />
-                            <DataGridTextColumn 
-                                Width="50"
-                                Binding="{Binding shift_desc}"
-                                Header="班次" />
+                           
                             <DataGridTemplateColumn Width="350" Header="操作">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
index 0c2a8c1..36f7ec7 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
@@ -79,7 +79,11 @@ 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();
+                    var inneconde= ExtractAndSort(i["prod_line_code"].ToString());
+                    foreach (var item in inneconde)
+                    {
+                        wet.prod_line_code += "[" + item+"],";
+                    }
                     wet.status = i["status"].ToString();
                     wet.sync_flag = i["sync_flag"].ToString(); 
                     wet.processid = i["route_code"].ToString();
@@ -101,9 +105,28 @@ namespace XGL.Views
             }
         }
 
-        
-      
 
+        public List<string> ExtractAndSort(string input)
+        {
+            List<string> extractedData = new List<string>();
+
+            JArray jsonArray = JArray.Parse(input);
+
+            foreach (JArray subArray in jsonArray)
+            {
+                if (subArray.Count == 2)
+                {
+                    string process = subArray[0].Value<string>();
+                    string value = subArray[1].Value<string>();
+
+                    if (process.StartsWith("GX-") && !process.Equals("GX-01"))
+                    {
+                        extractedData.Add(value);
+                    }
+                }
+            }
+            return extractedData;
+        }
         private T FindParent<T>(DependencyObject child) where T : DependencyObject
         {
             DependencyObject parent = VisualTreeHelper.GetParent(child);
diff --git a/shangjian/XGL/XGL.csproj b/shangjian/XGL/XGL.csproj
index ccf4de7..b9b9f05 100644
--- a/shangjian/XGL/XGL.csproj
+++ b/shangjian/XGL/XGL.csproj
@@ -14,6 +14,9 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -28,9 +31,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -1045,6 +1045,9 @@
     <EmbeddedResource Include="Resources\lanjuLogoNew.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <Content Include="Resources\nitsos.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="snap7.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/shangjian/XGL/XGL.csproj.user b/shangjian/XGL/XGL.csproj.user
index 6cbe588..f464c48 100644
--- a/shangjian/XGL/XGL.csproj.user
+++ b/shangjian/XGL/XGL.csproj.user
@@ -2,5 +2,13 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
+    <PublishUrlHistory />
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>zh-CN</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 6d6e602..e202a7f 100644
Binary files a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs
index 6e5fbe8..08ba4d5 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}" "F55780D9F30F77796BA7EF6A460C8B1C8132E11C574DF72B187C558C3B014DDB"
+#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84CC84ABB2A43A21EBE699A00C7C6E77D0AC1C22377A9346B423E5E739555B93"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -155,7 +155,15 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 565 "..\..\..\..\FormItem\Main.xaml"
+        #line 566 "..\..\..\..\FormItem\Main.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button notsos;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 569 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnZXH;
         
@@ -163,7 +171,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 569 "..\..\..\..\FormItem\Main.xaml"
+        #line 573 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnFault;
         
@@ -257,18 +265,27 @@ namespace XGL.FormItem {
             this.lbVersion = ((System.Windows.Controls.Label)(target));
             return;
             case 16:
-            this.btnZXH = ((System.Windows.Controls.Button)(target));
+            this.notsos = ((System.Windows.Controls.Button)(target));
             
-            #line 565 "..\..\..\..\FormItem\Main.xaml"
-            this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
+            #line 566 "..\..\..\..\FormItem\Main.xaml"
+            this.notsos.Click += new System.Windows.RoutedEventHandler(this.notsos_Click);
             
             #line default
             #line hidden
             return;
             case 17:
+            this.btnZXH = ((System.Windows.Controls.Button)(target));
+            
+            #line 569 "..\..\..\..\FormItem\Main.xaml"
+            this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 18:
             this.btnFault = ((System.Windows.Controls.Button)(target));
             
-            #line 574 "..\..\..\..\FormItem\Main.xaml"
+            #line 578 "..\..\..\..\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 6e5fbe8..08ba4d5 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}" "F55780D9F30F77796BA7EF6A460C8B1C8132E11C574DF72B187C558C3B014DDB"
+#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84CC84ABB2A43A21EBE699A00C7C6E77D0AC1C22377A9346B423E5E739555B93"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -155,7 +155,15 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 565 "..\..\..\..\FormItem\Main.xaml"
+        #line 566 "..\..\..\..\FormItem\Main.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button notsos;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 569 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnZXH;
         
@@ -163,7 +171,7 @@ namespace XGL.FormItem {
         #line hidden
         
         
-        #line 569 "..\..\..\..\FormItem\Main.xaml"
+        #line 573 "..\..\..\..\FormItem\Main.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button btnFault;
         
@@ -257,18 +265,27 @@ namespace XGL.FormItem {
             this.lbVersion = ((System.Windows.Controls.Label)(target));
             return;
             case 16:
-            this.btnZXH = ((System.Windows.Controls.Button)(target));
+            this.notsos = ((System.Windows.Controls.Button)(target));
             
-            #line 565 "..\..\..\..\FormItem\Main.xaml"
-            this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
+            #line 566 "..\..\..\..\FormItem\Main.xaml"
+            this.notsos.Click += new System.Windows.RoutedEventHandler(this.notsos_Click);
             
             #line default
             #line hidden
             return;
             case 17:
+            this.btnZXH = ((System.Windows.Controls.Button)(target));
+            
+            #line 569 "..\..\..\..\FormItem\Main.xaml"
+            this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 18:
             this.btnFault = ((System.Windows.Controls.Button)(target));
             
-            #line 574 "..\..\..\..\FormItem\Main.xaml"
+            #line 578 "..\..\..\..\FormItem\Main.xaml"
             this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
             
             #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 4883cef..8944cd8 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_Prepare.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
index 8fad750..faf2018 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}" "2B6A1D517BEF343A2353158DA8BCB47711BBC629395AAA11C458A4FE5BDC318C"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C41C0F6408F571D0A43946E277603A73C43EE476D5D0A621C63C1A2021A4F740"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -178,7 +178,7 @@ namespace XGL.Views {
             {
             case 7:
             
-            #line 411 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 412 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -186,7 +186,7 @@ namespace XGL.Views {
             break;
             case 8:
             
-            #line 418 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 419 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
             
             #line default
@@ -194,7 +194,7 @@ namespace XGL.Views {
             break;
             case 9:
             
-            #line 425 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 426 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_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 8fad750..faf2018 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}" "2B6A1D517BEF343A2353158DA8BCB47711BBC629395AAA11C458A4FE5BDC318C"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C41C0F6408F571D0A43946E277603A73C43EE476D5D0A621C63C1A2021A4F740"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -178,7 +178,7 @@ namespace XGL.Views {
             {
             case 7:
             
-            #line 411 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 412 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
             
             #line default
@@ -186,7 +186,7 @@ namespace XGL.Views {
             break;
             case 8:
             
-            #line 418 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 419 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
             
             #line default
@@ -194,7 +194,7 @@ namespace XGL.Views {
             break;
             case 9:
             
-            #line 425 "..\..\..\..\Views\LanJu_Prepare.xaml"
+            #line 426 "..\..\..\..\Views\LanJu_Prepare.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
             
             #line default
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache b/shangjian/XGL/obj/x86/Debug/XGL.csproj.AssemblyReference.cache
index e169e10..a46d157 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.FileListAbsolute.txt b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
index 1885dd8..03ae79b 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
+++ b/shangjian/XGL/obj/x86/Debug/XGL.csproj.FileListAbsolute.txt
@@ -788,3 +788,4 @@ E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CoreCompileInpu
 E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.csproj.CopyComplete
 E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.exe
 E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\XGL.pdb
+E:\workspace\LanJu\client\shangjian\XGL\bin\Debug\Resources\nitsos.png
diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe
index ee4ee36..4d57b51 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 6b17a4a..64e323e 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 f7520f4..5c84ad2 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_Content.g.cs b/shangjian/XGL/obj/x86/Debug/XGL_Content.g.cs
index 959c8fb..3e4f5bd 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_Content.g.cs
+++ b/shangjian/XGL/obj/x86/Debug/XGL_Content.g.cs
@@ -10,6 +10,7 @@
 
 [assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("newmessage.wav")]
 [assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("libmupdf.dll")]
+[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("resources/nitsos.png")]
 [assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("snap7.dll")]
 
 
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_Content.g.i.cs b/shangjian/XGL/obj/x86/Debug/XGL_Content.g.i.cs
index 959c8fb..3e4f5bd 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_Content.g.i.cs
+++ b/shangjian/XGL/obj/x86/Debug/XGL_Content.g.i.cs
@@ -10,6 +10,7 @@
 
 [assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("newmessage.wav")]
 [assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("libmupdf.dll")]
+[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("resources/nitsos.png")]
 [assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("snap7.dll")]
 
 
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
index 61eb604..97cad79 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
+++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache
@@ -11,7 +11,7 @@ false
 DEBUG;TRACE
 E:\workspace\LanJu\client\shangjian\XGL\App.xaml
 591234386457
-3-297253631
+4-78973161
 79-1358286590
 169-1229243378
 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;Views\ViewPlcInfoWin.xaml;Views\ViewLogWin.xaml;
diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
index 7889286..520d25b 100644
--- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
+++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.i.cache
@@ -4,17 +4,17 @@
 winexe
 C#
 .cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\
+E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\
 XGL
 none
 false
 DEBUG;TRACE
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
+E:\workspace\LanJu\client\shangjian\XGL\App.xaml
 591234386457
-3-297253631
+4-78973161
 801524658949
-1691309784480
+169-1229243378
 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;Views\ViewPlcInfoWin.xaml;Views\ViewLogWin.xaml;
 
-False
+True