diff --git a/Seyounth.Hyosung/Views/Pages/HomeViewPage.xaml b/Seyounth.Hyosung/Views/Pages/HomeViewPage.xaml
index 15955d2..3ffc4b3 100644
--- a/Seyounth.Hyosung/Views/Pages/HomeViewPage.xaml
+++ b/Seyounth.Hyosung/Views/Pages/HomeViewPage.xaml
@@ -20,122 +20,120 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <materialDesign:Card VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="16"
-                                     materialDesign:ElevationAssist.Elevation="Dp4">
+            <GroupBox VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="16"
+                      FontSize="22"
+                      materialDesign:ElevationAssist.Elevation="Dp6"
+                      Header="码垛工位1执行状态"
+                      Style="{StaticResource MaterialDesignCardGroupBox}">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <materialDesign:ColorZone>
-                        <TextBlock Margin="10" Text="码垛工位1" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                       FontSize="22" />
-                    </materialDesign:ColorZone>
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="托盘号:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack1.TrayCode}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack1.TrayCode}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="品类编号:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack1.VarietyCode}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack1.VarietyCode}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="码垛层数:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack1.Layers}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack1.Layers}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="总数:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack1.TotalCount}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack1.TotalCount}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="当前:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack1.CurrentCount}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack1.CurrentCount}"
+                                 VerticalAlignment="Center" />
                     </StackPanel>
                     <GroupBox Margin="16" FontSize="20" Grid.Row="2" Header="纱信息">
                         <ListView
-                                ItemsSource="{Binding ViewModel.Stack1.Yarns}">
+                            ItemsSource="{Binding ViewModel.Stack1.Yarns}">
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding }"
-                                            Header="序号" />
+                                        DisplayMemberBinding="{Binding ScanCode }"
+                                        Header="序号" />
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding QrCode}"
-                                            Header="二维码" />
+                                        DisplayMemberBinding="{Binding QrCode}"
+                                        Header="二维码" />
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding Lot}"
-                                            Header="Lot" />
+                                        DisplayMemberBinding="{Binding Lot}"
+                                        Header="Lot" />
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding StackTime}"
-                                            Header="码垛时间" />
+                                        DisplayMemberBinding="{Binding StackTime}"
+                                        Header="码垛时间" />
                                 </GridView>
                             </ListView.View>
                         </ListView>
                     </GroupBox>
                 </Grid>
-            </materialDesign:Card>
+            </GroupBox>
 
-            <materialDesign:Card Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                     Margin="16"
-                                     materialDesign:ElevationAssist.Elevation="Dp4">
+            <GroupBox Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                      Margin="16"
+                      FontSize="22"
+                      materialDesign:ElevationAssist.Elevation="Dp6"
+                      Header="码垛工位2执行状态"
+                      Style="{StaticResource MaterialDesignCardGroupBox}">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <materialDesign:ColorZone>
-                        <TextBlock Margin="10" Text="码垛工位2" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                       FontSize="22" />
-                    </materialDesign:ColorZone>
                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="托盘号:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack2.TrayCode}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack2.TrayCode}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="品类编号:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack2.VarietyCode}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack2.VarietyCode}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="码垛层数:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack2.Layers}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack2.Layers}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="总数:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack2.TotalCount}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack2.TotalCount}"
+                                 VerticalAlignment="Center" />
                         <TextBlock Foreground="White" Margin="10" FontSize="20" Text="当前:" />
                         <TextBox Foreground="#76ff03" IsEnabled="False" FontSize="20"
-                                     Text="{Binding ViewModel.Stack2.CurrentCount}"
-                                     VerticalAlignment="Center" />
+                                 Text="{Binding ViewModel.Stack2.CurrentCount}"
+                                 VerticalAlignment="Center" />
                     </StackPanel>
                     <GroupBox Margin="16" FontSize="20" Grid.Row="2" Header="纱信息">
                         <ListView
-                                ItemsSource="{Binding ViewModel.Stack2.Yarns}">
+                            ItemsSource="{Binding ViewModel.Stack2.Yarns}">
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding }"
-                                            Header="序号" />
+                                        DisplayMemberBinding="{Binding ScanCode }"
+                                        Header="序号" />
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding QrCode}"
-                                            Header="二维码" />
+                                        DisplayMemberBinding="{Binding QrCode}"
+                                        Header="二维码" />
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding Lot}"
-                                            Header="Lot" />
+                                        DisplayMemberBinding="{Binding Lot}"
+                                        Header="Lot" />
                                     <GridViewColumn
-                                            DisplayMemberBinding="{Binding StackTime}"
-                                            Header="码垛时间" />
+                                        DisplayMemberBinding="{Binding StackTime}"
+                                        Header="码垛时间" />
                                 </GridView>
                             </ListView.View>
                         </ListView>
                     </GroupBox>
                 </Grid>
-            </materialDesign:Card>
+            </GroupBox>
         </Grid>
         <StackPanel Grid.Row="1" Orientation="Horizontal">
             <GroupBox
@@ -282,10 +280,6 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
@@ -294,16 +288,14 @@
                                    Foreground="White" Grid.Row="0" Text="托盘号:" />
                         <TextBox TextAlignment="Right" Margin="10" Foreground="White" Grid.Row="0" Grid.Column="1"
                                  IsEnabled="False" />
-                        <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="1" Grid.Column="0" Text="定位套:" />
-                        <TextBox TextAlignment="Right" Margin="10" Foreground="White" Grid.Row="1" Grid.Column="1"
-                                 IsEnabled="False" />
                     </Grid>
                     <Grid Grid.Row="1">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
@@ -312,28 +304,43 @@
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
                         <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="0" Grid.Column="0" Text="顶盖:" />
-                        <CheckBox Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" />
-
+                                   Foreground="White" Grid.Row="0" Grid.Column="0" Text="主-贴标数:" />
+                        <TextBox  Foreground="White" IsEnabled="False" Margin="10" Grid.Row="0" Grid.Column="1"  />
                         <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="0" Grid.Column="2" Text="护角:" />
-                        <CheckBox Grid.Row="0" Grid.Column="3" HorizontalAlignment="Center" />
-
-                        <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="1" Grid.Column="0" Text="套箱:" />
+                                   Foreground="White" Grid.Row="1" Grid.Column="0" Text="主-前:" />
                         <CheckBox Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center" />
 
                         <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="1" Grid.Column="2" Text="打带:" />
-                        <CheckBox Grid.Row="1" Grid.Column="3" HorizontalAlignment="Center" />
-
-                        <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="2" Grid.Column="0" Text="缠膜:" />
+                                   Foreground="White" Grid.Row="2" Grid.Column="0" Text="主-左:" />
                         <CheckBox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" />
 
                         <TextBlock VerticalAlignment="Center" Margin="10"
-                                   Foreground="White" Grid.Row="2" Grid.Column="2" Text="覆膜:" />
+                                   Foreground="White" Grid.Row="3" Grid.Column="0" Text="主-后:" />
+                        <CheckBox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Center" />
+                        
+                        <TextBlock VerticalAlignment="Center" Margin="10"
+                                   Foreground="White" Grid.Row="4" Grid.Column="0" Text="主-右:" />
+                        <CheckBox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Center" />
+                        
+                        <TextBlock VerticalAlignment="Center" Margin="10"
+                                   Foreground="White" Grid.Row="0" Grid.Column="2" Text="副-贴标数:" />
+                        <TextBox  Foreground="White" IsEnabled="False" Margin="10" Grid.Row="0" Grid.Column="3"  />
+                        
+                        <TextBlock VerticalAlignment="Center" Margin="10"
+                                   Foreground="White" Grid.Row="1" Grid.Column="2" Text="副-前:" />
+                        <CheckBox Grid.Row="1" Grid.Column="3" HorizontalAlignment="Center" />
+                        
+                        <TextBlock VerticalAlignment="Center" Margin="10"
+                                   Foreground="White" Grid.Row="2" Grid.Column="2" Text="副-左:" />
                         <CheckBox Grid.Row="2" Grid.Column="3" HorizontalAlignment="Center" />
+                        
+                        <TextBlock VerticalAlignment="Center" Margin="10"
+                                   Foreground="White" Grid.Row="3" Grid.Column="2" Text="副-后:" />
+                        <CheckBox Grid.Row="3" Grid.Column="3" HorizontalAlignment="Center" />
+                        
+                        <TextBlock VerticalAlignment="Center" Margin="10"
+                                   Foreground="White" Grid.Row="4" Grid.Column="2" Text="副-右:" />
+                        <CheckBox Grid.Row="4" Grid.Column="3" HorizontalAlignment="Center" />
                     </Grid>
                 </Grid>
             </GroupBox>