diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
index adaa3bc9..a7897d6f 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
@@ -165,5 +165,9 @@ namespace BBWY.Client.Models.APIModel
         ///分箱情况
         /// </summary>
         public WareHourseDTO[] WareHourses { get; set; }
+        /// <summary>
+        /// 地托编号
+        /// </summary>
+        public int? FloorDragNumber { get; set; }
     }
 }
diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs
index 97fb48ed..ce5db38a 100644
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@@ -124,7 +124,7 @@ namespace BBWY.Client.Models
 
             serviceViewModel.PackTaskModel = this;
             serviceViewModel.PackTaskList = new System.Collections.ObjectModel.ObservableCollection<PackTaskModel> { this};
-
+            serviceViewModel.FloorDragNumber = this.FloorDragNumber;
             serviceViewModel.TaskCount = SkuCount;
             serviceViewModel.TaskId = TaskId;
             serviceViewModel.OrderId= OrderId;
@@ -512,6 +512,8 @@ namespace BBWY.Client.Models
         public IList<SkuMessage> ItemList { get; set; }
 
         public string OrderId { get; set; }
+        private int? floorDragNumber;
+        public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } }
     }
 
     public class SkuMessage : NotifyObject
@@ -565,5 +567,7 @@ namespace BBWY.Client.Models
         /// 货号
         /// </summary>
         public string GoodsNo { get => goodsNo; set { Set(ref goodsNo, value); } }
+
+ 
     }
 }
diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
index 0248f8d8..8f79d6a5 100644
--- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
@@ -35,6 +35,9 @@ namespace BBWY.Client.ViewModels.PackTask
     public class PackServiceViewModel : BaseVM, IDenpendency
     {
 
+        private int? floorDragNumber;
+        public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } }
+
         private string packUserName;
         /// <summary>
         /// 打包人
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 14cc413c..722fc381 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -360,7 +360,10 @@ namespace BBWY.Client.ViewModels.PackTask
                         System.Windows.MessageBox.Show("请先设置打包费用!");
                         return;
                     }
-
+                    if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
+                                 MessageBoxButton.YesNo,
+                                 MessageBoxImage.Warning) != MessageBoxResult.Yes)
+                        return;
                     res = packTaskService.SetPackTaskState(taskId, PackTaskState.待封箱);
                     break;
                 case PackTaskState.待封箱:
@@ -499,7 +502,6 @@ namespace BBWY.Client.ViewModels.PackTask
 
                 });
             else
-
                 Task.Factory.StartNew(() =>
                 {
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
@@ -540,6 +542,8 @@ namespace BBWY.Client.ViewModels.PackTask
                                 OrderId = item.OrderId,
                                 SkuId = item.SkuId,
                                 SkuName = item.SkuName,
+                                FloorDragNumber=item.FloorDragNumber,
+                              
 
                             };
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
index d036a2c1..7c00f11e 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@@ -415,9 +415,6 @@
 
 
         <Grid Grid.Row="1" Grid.Column="1"  Visibility="Hidden">
-
-
-
             <StackPanel Orientation="Vertical" Name="printArea"  Width="1065" Height="800">
 
                 <StackPanel Orientation="Horizontal">
@@ -429,6 +426,8 @@
                         <Image  Height="60" Width="200"  Source="{Binding TaskImage}"/>
                         <TextBlock Grid.Row="1"  FontSize="18" Style="{StaticResource middleTextBlock}" Text="{Binding TaskId}"/>
                     </Grid>
+                    <TextBlock Text="摆放地托编号:" FontSize="24" FontWeight="Bold" Style="{StaticResource middleTextBlock}" Margin="20 0 0 0"/>
+                    <TextBlock Text="{Binding FloorDragNumber}" FontSize="24" FontWeight="Bold" Style="{StaticResource middleTextBlock}" Margin="20 0 0 0"/>
                     <TextBlock Text="打包人:" FontSize="24" FontWeight="Bold" Style="{StaticResource middleTextBlock}" Margin="20 0 0 0"/>
                     <TextBlock Text="{Binding PackUserName}" FontSize="24" FontWeight="Bold" Style="{StaticResource middleTextBlock}" Margin="20 0 0 0"/>
                 </StackPanel>
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 8523915c..18dbd7a9 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -60,19 +60,20 @@
             <TextBlock Text="操作" Grid.Column="12"   Style="{StaticResource middleTextBlock}"/>
 
 
+            <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
             <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
-            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
         </Grid>
         <!--ItemsSource="{Binding OrderList}"-->
@@ -150,7 +151,7 @@
                                 <ColumnDefinition Width="100"/>
                             </Grid.ColumnDefinitions>
                             <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
-                                         Style="{StaticResource NoScrollViewListBoxStyle}"
+                                         Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
                                          ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
@@ -356,10 +357,11 @@
                                 </StackPanel>
                             </Grid>
                             <Grid Grid.Column="10">
+
                                 <Grid>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="3*"/>
                                         <RowDefinition Height="*"/>
+                                        <RowDefinition Height="30"/>
                                     </Grid.RowDefinitions>
                                     <StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                         <TextBlock  Text="收费:"/>
@@ -385,7 +387,7 @@
 
                                     </StackPanel>
 
-                                    <Grid Grid.Row="1"  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|已取消:Collapsed:Visible}">
+                                    <Grid Grid.Row="1"  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检|已取消:Collapsed:Visible}">
                                         <Border Grid.Row="0" VerticalAlignment="Top" Height="1"  Background="{StaticResource Border.Brush}"/>
 
                                         <StackPanel  Orientation="Horizontal" HorizontalAlignment="Center"
@@ -481,20 +483,20 @@
 
                                 </StackPanel>
                             </Grid>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                            <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
+                            <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="5" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="6" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="7" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="8" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="9" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="10" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="11" Margin="-1 0 0 0"/>
+                            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="12" Margin="-1 0 0 0"/>
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
-                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
 
                         </Grid>
                         <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>