From 6a15770b57734d2b9efcad3e3e20f9306db9dfe0 Mon Sep 17 00:00:00 2001
From: zhaojian <qj120227@163.com>
Date: Mon, 20 Nov 2023 15:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BD=8D=E6=9C=BA=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shangjian/XGL.Data/DBService/DBService.cs |   2 +-
 shangjian/XGL/App.config                  |   2 +-
 shangjian/XGL/HFstatus.xaml               | 231 ++++++++++++++++++++++
 shangjian/XGL/HFstatus.xaml.cs            | 146 ++++++++++----
 4 files changed, 339 insertions(+), 42 deletions(-)

diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs
index 67c6cc0..74cb38e 100644
--- a/shangjian/XGL.Data/DBService/DBService.cs
+++ b/shangjian/XGL.Data/DBService/DBService.cs
@@ -778,7 +778,7 @@ where route.route_code = '{processid}'"; //where  CONVERT(VARCHAR(10), wet.plan_
         /// <returns></returns>
         public List<BaseEquipmentAttached> GetHFStatusInfo()
         {
-            string sql = $@"SELECT * FROM [dbo].[base_equipment_attached] WHERE (property='dollyNumber' OR property='state') AND device_code LIKE '%H%' ORDER BY device_code";
+            string sql = $@"SELECT * FROM [dbo].[base_equipment_attached] WHERE (property='dollyNumber' OR property='state' or property='Intheoven') AND device_code LIKE '%H%' ORDER BY device_code";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
 
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index caa19a2..2138ec3 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C3" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
-		<add key="ClientMode" value="2" />
+		<add key="ClientMode" value="1" />
 		<add key="SerialPort" value="COM5" />
 		<add key="DryingHouseList" value="H16,H17,H18" />
 		<!--线体编码-->
diff --git a/shangjian/XGL/HFstatus.xaml b/shangjian/XGL/HFstatus.xaml
index cd723e1..e302043 100644
--- a/shangjian/XGL/HFstatus.xaml
+++ b/shangjian/XGL/HFstatus.xaml
@@ -47,6 +47,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -73,6 +74,16 @@
                             <TextBlock Text="查询中~" Name="menqian18" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang18" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="3">
                         <Grid >
                             <Grid.ColumnDefinitions>
@@ -92,12 +103,23 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
                             <Label Content="烘房编号:H17" FontSize="25" Height="62"/>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang17" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="1">
                         <Grid  >
                             <Grid.ColumnDefinitions>
@@ -137,6 +159,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -173,6 +196,16 @@
                             <TextBlock Text="查询中~" Name="daojishi16" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang16" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="0" Grid.Column="3" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -182,6 +215,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -218,6 +252,16 @@
                             <TextBlock Text="查询中~" Name="daojishi15" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang15" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="0" Grid.Column="4" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -227,6 +271,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -263,6 +308,16 @@
                             <TextBlock Text="查询中~" Name="daojishi14" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang14" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="0" Grid.Column="5" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -272,6 +327,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -308,6 +364,16 @@
                             <TextBlock Text="查询中~" Name="daojishi13" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang13" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="0" Grid.Column="6" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -317,6 +383,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -353,6 +420,16 @@
                             <TextBlock Text="查询中~" Name="daojishi12" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang12" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="0" Grid.Column="7" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -362,6 +439,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -398,6 +476,16 @@
                             <TextBlock Text="查询中~" Name="daojishi11" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang11" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="0" Grid.Column="15" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -407,6 +495,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -443,6 +532,16 @@
                             <TextBlock Text="查询中~" Name="daojishi10" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang10" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             
@@ -602,6 +701,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -638,6 +738,16 @@
                             <TextBlock Text="查询中~" Name="daojishi9" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang9" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="1" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -647,6 +757,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -683,6 +794,16 @@
                             <TextBlock Text="查询中~" Name="daojishi8" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang8" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="2" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -692,6 +813,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -728,6 +850,16 @@
                             <TextBlock Text="查询中~" Name="daojishi7" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang7" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="3" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -737,6 +869,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -773,6 +906,16 @@
                             <TextBlock Text="查询中~" Name="daojishi6" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang6" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="4" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -782,6 +925,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -818,6 +962,16 @@
                             <TextBlock Text="查询中~" Name="daojishi5" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang5" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="5" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -827,6 +981,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -863,6 +1018,16 @@
                             <TextBlock Text="查询中~" Name="daojishi4" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang4" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="6" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -872,6 +1037,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -908,6 +1074,16 @@
                             <TextBlock Text="查询中~" Name="daojishi3" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang3" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="7" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -917,6 +1093,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -953,6 +1130,16 @@
                             <TextBlock Text="查询中~" Name="daojishi2" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang2" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="2" Grid.Column="8" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -962,6 +1149,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -998,6 +1186,16 @@
                             <TextBlock Text="查询中~" Name="daojishi1" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang1" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="4" Grid.Column="0" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -1007,6 +1205,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -1043,6 +1242,16 @@
                             <TextBlock Text="查询中~" Name="daojishi61" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang61" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="4" Grid.Column="1" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -1052,6 +1261,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -1088,6 +1298,16 @@
                             <TextBlock Text="查询中~" Name="daojishi62" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang62" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
             <Border Grid.Row="4" Grid.Column="2" BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" >
@@ -1097,6 +1317,7 @@
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="0">
                         <Grid>
@@ -1133,6 +1354,16 @@
                             <TextBlock Text="查询中~" Name="daojishi63" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
                         </Grid>
                     </Border>
+                    <Border BorderThickness="1,1,1,1" BorderBrush="#9DF3FF" Grid.Row="5">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Label Content="实际数量:" Grid.Row="1" FontSize="15" VerticalContentAlignment="Center" BorderThickness="0"></Label>
+                            <TextBlock Text="查询中~" Name="shuliang63" Grid.Row="1" FontSize="15" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+                        </Grid>
+                    </Border>
                 </Grid>
             </Border>
         </Grid>
diff --git a/shangjian/XGL/HFstatus.xaml.cs b/shangjian/XGL/HFstatus.xaml.cs
index 6976e0b..060e848 100644
--- a/shangjian/XGL/HFstatus.xaml.cs
+++ b/shangjian/XGL/HFstatus.xaml.cs
@@ -56,8 +56,11 @@ namespace XGL
             {
                 if (item.device_code=="H18")
                 {
-                   
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang18.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -120,8 +123,11 @@ namespace XGL
                   
                 }else if (item.device_code == "H17")
                 {
-                   
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang17.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -186,8 +192,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H16")
                 {
-                    
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang16.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -251,8 +260,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H15")
                 {
-                    
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang15.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -315,8 +327,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H14")
                 {
-                    
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang14.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -380,8 +395,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H13")
                 {
-                   
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang13.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -445,8 +463,12 @@ namespace XGL
                 }
                 else if (item.device_code == "H12")
                 {
-                   
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang12.Text = item.isvalue;
+                    }
+
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -509,8 +531,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H11")
                 {
-                  
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang11.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -573,8 +598,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H10")
                 {
-                   
-                        if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang10.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                         {
                             if (item.isvalue.ToString() == "1")
                             {
@@ -637,8 +665,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H61")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang61.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -701,8 +732,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H62")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang62.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -765,8 +799,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H63")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang63.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -829,8 +866,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H9")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang9.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -893,8 +933,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H8")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang8.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -957,8 +1000,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H7")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang7.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -1021,8 +1067,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H6")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang6.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -1085,8 +1134,12 @@ namespace XGL
                 }
                 else if (item.device_code == "H5")
                 {
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang5.Text = item.isvalue;
+                    }
 
-                    if (item.property == "dollyNumber")
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -1149,8 +1202,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H4")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang4.Text = item.isvalue;
+                    }
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -1213,8 +1269,12 @@ namespace XGL
                 }
                 else if (item.device_code == "H3")
                 {
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang3.Text = item.isvalue;
+                    }
 
-                    if (item.property == "dollyNumber")
+                    else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -1277,8 +1337,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H2")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang2.Text = item.isvalue;
+                    }
+                    else if(item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {
@@ -1341,8 +1404,11 @@ namespace XGL
                 }
                 else if (item.device_code == "H1")
                 {
-
-                    if (item.property == "dollyNumber")
+                    if (item.property == "Intheoven")
+                    {
+                        shuliang1.Text = item.isvalue;
+                    }
+                     else if (item.property == "dollyNumber")
                     {
                         if (item.isvalue.ToString() == "1")
                         {