diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 96315e2..ecb77f5 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1572,22 +1572,44 @@
                                 <TabItem  x:Name="CallPersonManager" Header="人工叫料" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="100" Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
+                                            <RowDefinition Height="auto"/>
                                             <RowDefinition Height="auto"/>
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="auto"/>
+                                          
                                         </Grid.RowDefinitions>
                                         <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10"  Margin="0,5,0,0">
                                             <StackPanel Orientation="Horizontal">
                                                 <TextBlock Text="物料名称:" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                                 <TextBox x:Name="MaterialName" Width="200" Height="40" Margin="5,0,0,0" VerticalAlignment="Center"/>
                                                 <Button Content="搜索" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="SelectButton_Click"/>
-                                                <Button Content="出空箱" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="CallEmptyBtn_Click"/>
-                                                <Button Content="出选择料箱" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click"/>
+                                                <Button Content="出空箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="CallEmptyBtn_Click"/>
+                                                <Button Content="出选择料箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click"/>
                                             </StackPanel>
                                         </Border>
+                                        <Border Grid.Row="1" Height="100" Background="#213269" BorderThickness="2" CornerRadius="10" Margin="0,5,0,0">
+                                            <ItemsControl x:Name="itemsControl">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <WrapPanel />
+                                                        <!-- 使项自动换行 -->
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
+                                                <ItemsControl.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Border  Margin="5" Padding="5">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock Text="{Binding palletInfoCode}" VerticalAlignment="Center"/>
+                                                                <Button Content="删除" FontSize="15" Width="50"  Background="LightSkyBlue" Foreground="Red" Margin="0,0,10,0" Click="DeleteButton_Click" Tag="{Binding}"/>
+                                                            </StackPanel>
+                                                        </Border>
+                                                    </DataTemplate>
+                                                </ItemsControl.ItemTemplate>
+                                            </ItemsControl>
+                                        </Border>
                                         <DataGrid 
                                               Style="{StaticResource DataGridStyle}"
-                                              Grid.Row="1" AlternationCount="2"
+                                              Grid.Row="2" AlternationCount="2"
                                               AutoGenerateColumns="False"
                                               MinRowHeight="50"
                                               Background="#172557"
@@ -1640,7 +1662,7 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 <DataGridTextColumn
-                                                    Width="180*"
+                                                    Width="200*"
                                                     Binding="{Binding locationCode}"
                                                     CanUserSort="False"
                                                     ElementStyle="{StaticResource dgCell}"
@@ -1648,7 +1670,7 @@
                                                     Header="库位号"
                                                     IsReadOnly="True" />
                                                 <DataGridTextColumn
-                                                    Width="180*"
+                                                    Width="200*"
                                                     Binding="{Binding palletInfoCode}"
                                                     CanUserSort="False"
                                                     ElementStyle="{StaticResource dgCell}"
@@ -1656,15 +1678,15 @@
                                                     Header="料箱号"
                                                     IsReadOnly="True" />
                                                 <DataGridTextColumn
-                                                     Width="180*"
-                                                     Binding="{Binding materialId}"
+                                                     Width="200*"
+                                                     Binding="{Binding materialCode}"
                                                      CanUserSort="False"
                                                      ElementStyle="{StaticResource dgCell}"
                                                      FontSize="20"
-                                                     Header="物料Id"
+                                                     Header="物料编码"
                                                      IsReadOnly="True" />
                                                 <DataGridTemplateColumn
-                                                        Width="350*"
+                                                        Width="280*"
                                                         CanUserSort="False"
                                                         Header="物料名称"
                                                         IsReadOnly="True" >
@@ -1675,7 +1697,7 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 <DataGridTemplateColumn
-                                                   Width="350*"
+                                                   Width="300*"
                                                    CanUserSort="False"
                                                    Header="物料规格"
                                                    IsReadOnly="True" >
@@ -1742,7 +1764,7 @@
                                                 </Style>
                                             </DataGrid.ColumnHeaderStyle>
                                         </DataGrid>
-                                        <hc:Pagination x:Name="Pagination2" Grid.Row="2" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination2_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
+                                        <hc:Pagination x:Name="Pagination2"  Grid.Row="3" Height="50" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination2_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
                                     </Grid>
                                 </TabItem>
                                 <TabItem  x:Name="InventoryManager" Header="盘库任务" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="100" Margin="5">
@@ -1900,7 +1922,7 @@
                                                 </Style>
                                             </DataGrid.ColumnHeaderStyle>
                                         </DataGrid>
-                                        <hc:Pagination x:Name="Pagination3" Grid.Row="2" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination3_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
+                                        <hc:Pagination x:Name="Pagination3" Grid.Row="3" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination3_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
                                     </Grid>
                                 </TabItem>
                                 <TabItem   x:Name="ScanInManager" Header="扫描入库" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="100" Margin="5">
@@ -1920,28 +1942,33 @@
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="167*"/>
+                                                        <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="166.667"/>
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="167*"/>
-                                                        <RowDefinition Height="83*"/>
+                                                        <RowDefinition Height="167*"/>
                                                     </Grid.RowDefinitions>
                                                     <TextBlock Text="扫描入库"  FontSize="50" Grid.ColumnSpan="6"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                                     <TextBlock Text="扫描料箱号:" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                     <TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <TextBlock Text="入库数量:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                    <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                    <TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                    <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                     <Button Click="barClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,130,0"  Grid.Column="5" Grid.Row="2">
                                                         <Image Source="..\Resources\cancel.png"/>
                                                     </Button>
                                                     <Button Click="boxClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,130,0"  Grid.Column="5" Grid.Row="1">
                                                         <Image Source="..\Resources\cancel.png"/>
                                                     </Button>
-                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
-                                                    <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
-                                                    <Button Content="确认入库" Grid.Row="4" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click"/>
-                                                    <Button Content="一键收料" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click"/>
-                                                    <TextBlock  Grid.Row="6" Text="提示信息:"  HorizontalAlignment="Center"  Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50"  Foreground="White" />
-                                                    <TextBlock x:Name="MsgText"  Grid.Row="6"  FontSize="40" Grid.ColumnSpan="5" Width="800" Height="60"   Foreground="White" HorizontalAlignment="Right" />
+                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="materialName" IsReadOnly="True"  hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="materialSpec" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="3" />
+                                                    <Button Content="确认入库" Grid.Row="6" Grid.ColumnSpan="6" Width="300" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click"/>
+                                                    <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="6" Width="300" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Right"/>
+                                                    <TextBlock  Grid.Row="7" Text="提示信息:"  HorizontalAlignment="Center"  Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50"  Foreground="White" />
+                                                    <TextBlock x:Name="MsgText"   Grid.Row="7"  FontSize="50" Grid.ColumnSpan="5" Width="800" Height="100"   Foreground="White" HorizontalAlignment="Right" />
                                                     <Button Content="执行CTU入库任务" Visibility="Hidden" Click="btnCtuInConfirmBox_Click" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White"/>
                                                 </Grid>
                                             </StackPanel>