diff --git a/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs b/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs
index 1a7c7571..debf0ee6 100644
--- a/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs
@@ -99,6 +99,10 @@ namespace BBWY.Client.Models.APIModel.Response.PackPurchaseTask
         /// 
         /// </summary>
         public SaveType? SaveType { get; set; }
+        /// <summary>
+        /// 商家自取数
+        /// </summary>
+        public int? StoreGetSelfCount { get; set; }
     }
     public class WareHourseDTO
     {
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index a3723fe8..1a1ba198 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -1353,138 +1353,12 @@ namespace BBWY.Client.ViewModels.PackTask
         #region 事件绑定 
 
 
-        /// <summary>
-        /// 推送sku配置状态
-        /// </summary>
-        public ICommand SendToSetSkuConfigureCommand { get; set; }
-        /// <summary>
-        /// 提交超时原因
-        /// </summary>
-        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
-        /// <summary>
-        /// 查看揽收单
-        /// </summary>
-        public ICommand LookLSOrderConfigureCommand { get; set; }
-        /// <summary>
-        /// 打印揽收单
-        /// </summary>
-        public ICommand PrintLSOrderConfigureCommand { get; set; }
-        /// <summary>
-        /// 打印封箱明细
-        /// </summary>
-        public ICommand PrintSealBoxDetailsCommand { get; set; }
-        /// <summary>
-        /// 待完结 完成事件
-        /// </summary>
-        public ICommand CompeteWaitCompletedCommand { get; set; }
-
-        /// <summary>
-        /// 待转运 完成事件
-        /// </summary>
-        public ICommand CompeteWaitTransportCommand { get; set; }
-
-        /// <summary>
-        /// 设置仓库类型
-        /// </summary>
-        public ICommand SetWareTypeCommand { get; set; }
-
-        /// <summary>
-        /// 查看箱唛配置
-        /// </summary>
-        public ICommand LookBoxConfigureCommand { get; set; }
-        /// <summary>
-        /// 待配置 /已配置
-        /// </summary>
-        public ICommand SetSealBoxConfigureTypeCommand { get; set; }
-        public ICommand CompeteFallWareCommand { get; set; }
-        public ICommand CompeteSealBoxCommand { get; set; }
-
-        public ICommand CompletedPackTaskCommand { get; set; }
-
-
-        /// <summary>
-        /// 打开图片链接
-        /// </summary>
-        public ICommand OpenSkuDetailCommand { get; set; }
-
-
-        /// <summary>
-        /// 筛选数据 
-        /// </summary>
-        public ICommand SetTaskStateCommand { get; set; }
-
-        /// <summary>
-        /// 修改任务状态
-        /// </summary>
-        public ICommand UpdateTaskStateCommand { get; set; }
-        /// <summary>
-        /// 搜索数据
-        /// </summary>
-        public ICommand SearchTaskCommand { get; set; }
-
-        /// <summary>
-        /// 创建任务
-        /// </summary>
-        public ICommand CreateTaskCommand { get; set; }
-
-        /// <summary>
-        /// 页面改变事件
-        /// </summary>
-        public ICommand TaskPageIndexChangedCommand { get; set; }
-
-        /// <summary>
-        /// 设置分箱数量
-        /// </summary>
-        public ICommand SetSealBoxCommand { get; set; }
-
-
-        /// <summary>
-        /// 打印封箱数据
-        /// </summary>
-        public ICommand PrintBoxConfigureCommand { get; set; }
-
-
-        /// <summary>
-        /// 删除任务
-        /// </summary>
-        public ICommand DeletedTaskCommand { get; set; }
-
-
-        /// <summary>
-        /// 商家自取
-        /// </summary>
-        public ICommand StoreGetBySelfCommand { get; set; }
-
-
         /// <summary>
         /// 商家自取(未验收)
         /// </summary>
         public ICommand QualityStoreGetBySelfCommand { get; set; }
 
 
-        /// <summary>
-        /// 加载事件(待封箱)
-        /// </summary>
-        public ICommand LoadSkuDataCommand { get; set; }
-
-        /// <summary>
-        /// 加载事件(封箱已配置)
-        /// </summary>
-        public ICommand LoadSealBoxSkuDataCommand { get; set; }
-
-        /// <summary>
-        /// 落仓
-        /// </summary>
-        public ICommand LoadFallWareSkuDataCommand { get; set; }
-
-        /// <summary>
-        /// 转运
-        /// </summary>
-        public ICommand LoadTransportSkuDataCommand { get; set; }
-
-
-
-
         /// <summary>
         /// 完成封箱
         /// </summary>
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 8e72a7f2..eed8c773 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -114,6 +114,12 @@ namespace BBWY.Client.ViewModels
         public int WareHourseCount { get => wareHourseCount; set { Set(ref wareHourseCount, value); } }
 
 
+        private int? storeGetSelfCount;
+        /// <summary>
+        /// 商家自取数
+        /// </summary>
+        public int? StoreGetSelfCount { get => storeGetSelfCount; set { Set(ref storeGetSelfCount, value); } }
+
 
         private int skuCount;
         /// <summary>
@@ -688,6 +694,7 @@ namespace BBWY.Client.ViewModels
             SkuTitle = model.SkuTitle;
             BasicPack = model.BasicPack;
             CertificatePosition = model.CertificatePosition;
+
             //ArrivalQuantity = 0;
             //GoodProductQuantity = 0;
 
@@ -734,7 +741,9 @@ namespace BBWY.Client.ViewModels
                     MessageBox.Show(packTaskRes.Msg);
                     return;
                 }
-                SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
+                StoreGetSelfCount = packTaskRes.Data.StoreGetSelfCount;
+
+    SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
                 saveType = packTaskRes.Data.SaveType;
                 if (saveType == null)
                 {
diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml
index f3fa5925..5478e66b 100644
--- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml
+++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml
@@ -109,64 +109,48 @@
             </Grid>
             <Grid Grid.Column="1">
                 <StackPanel  Orientation="Vertical">
-                    <TextBlock Text="任务信息"  Margin="20 10" FontSize="13" FontWeight="Bold" HorizontalAlignment="Left" />
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="520"/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
+                    <TextBlock Text="数量验收"  Margin="20 10" FontSize="13" FontWeight="Bold" HorizontalAlignment="Left" />
+
                         <StackPanel Orientation="Vertical" Margin="20 10  " HorizontalAlignment="Left">
                             <StackPanel Orientation="Horizontal" Height="30">
-                                <TextBlock  VerticalAlignment="Center">
-                                    <Run Text="采购数量:"/>
+                                <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left">
+                                    <Run Text="应到数量:"/>
                                     <Run Text="{Binding SkuCount}"/>
                                 </TextBlock>
-                                <UniformGrid Columns="2"  Margin="30 0 0 0">
-                                    <TextBlock Text="到货数量: " VerticalAlignment="Center"/>
-                                    <c:BTextBox  WaterRemark="数量"  Text="{Binding ArrivalQuantity}" Height="30"/>
-                                </UniformGrid>
-                                <UniformGrid Columns="2" Margin="30 0 0 0">
+                                <StackPanel Orientation="Horizontal"   Margin="30 0 0 0">
+                                    <TextBlock Text="实收数量: " VerticalAlignment="Center" Width="60"/>
+                                    <c:BTextBox  WaterRemark="数量"  Text="{Binding ArrivalQuantity}" Height="30" MinWidth="60"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Margin="30 0 0 0">
                                     <TextBlock Text="良品数量: " VerticalAlignment="Center"/>
-                                    <c:BTextBox  WaterRemark="数量" Text="{Binding GoodProductQuantity}" Height="30"/>
-                                </UniformGrid>
+                                    <c:BTextBox  WaterRemark="数量" Text="{Binding GoodProductQuantity}" Height="30" MinWidth="60"/>
+                                </StackPanel>
 
                             </StackPanel>
-                            <StackPanel Orientation="Horizontal" Margin="0 30 0 0" >
-                                <TextBlock  VerticalAlignment="Center"  Visibility="{Binding WareHourseCount,Mode=TwoWay,Converter={StaticResource objConverter}, ConverterParameter=0:Collapsed:Visible}" >
+                            <StackPanel Orientation="Horizontal" Margin="0 20 0 0" >
+                            <!--<TextBlock  VerticalAlignment="Center"  Visibility="{Binding WareHourseCount,Mode=TwoWay,Converter={StaticResource objConverter}, ConverterParameter=0:Collapsed:Visible}" >
                                     <Run Text="份数:"/>
                                     <Run Text="{Binding WareHourseCount,Mode=TwoWay}"/>
-                                </TextBlock>
-                                <!--<StackPanel Orientation="Horizontal" Margin="10 0 0 0" Height="30">
-                                    <TextBlock Text="预计完成时间: " VerticalAlignment="Center" />
-                                    <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">
-                                        <ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeDayList,Mode=TwoWay}" SelectedIndex="0"  Text="{Binding PreCompeteTimeDay,Mode=TwoWay}">
-                                            
-                                        </ComboBox>
-                                    </Border>
-                                    <Border BorderBrush="{StaticResource Border.Brush}" Height="30" Margin="10 0 0 0" BorderThickness="1">
-                                        <hc:ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeHourList}" SelectedIndex="0"  Text="{Binding PreCompeteTimeHour}">
-                               
-                                        </hc:ComboBox>
-                                    </Border>
-                                </StackPanel>-->
-                                <StackPanel Orientation="Horizontal">
+                            </TextBlock>-->
+                            <!--<StackPanel Orientation="Horizontal">
                                     <TextBlock Style="{StaticResource middleTextBlock}" Text="摆放地托编号:" Margin="10 0 0 0"/>
                                     <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">
                                         <hc:ComboBox Width="80" BorderThickness="0" ItemsSource="{Binding FloorDragNumberList}" SelectedIndex="0"   Text="{Binding FloorDragNumber}">
 
                                         </hc:ComboBox>
                                     </Border>
-                                </StackPanel>
-
+                                </StackPanel>-->
+                            <StackPanel Orientation="Horizontal" DockPanel.Dock="Top"  Visibility="{Binding StoreGetSelfCount,Mode=TwoWay,Converter={StaticResource objConverter},ConverterParameter=#null|0:Collapsed:Visible}">
+                                <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left">
+<Run Text="商家自取:"/>
+<Run Text="{Binding StoreGetSelfCount}" Foreground="Red"/>
+                                </TextBlock>
                             </StackPanel>
                         </StackPanel>
-                        <!--<c:BTextBox WaterRemark="包装备注" Text="{Binding MarkMessage,Mode=TwoWay}" Grid.Column="1" Margin="0 5 10 5" Height="80"/>-->
+                        </StackPanel>
+                
+
 
-                        <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" CornerRadius="0"  Grid.Column="1" Margin="0 5 10 5" MaxHeight="120" >
-                            <TextBox   Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"    ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                      AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                        </Border>
-                    </Grid>
 
                     <ListBox Grid.Row="2" Grid.ColumnSpan="2"
                                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
@@ -471,19 +455,28 @@
                             </ComboBox>
                         </Grid>
                     </Grid>
+                    <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" CornerRadius="0"  Grid.Column="1" Margin="20 5 20 5" MaxHeight="80" >
+                        <TextBox   Text="{Binding ShowMarkMessage}"   HorizontalAlignment="Left" VerticalAlignment="Top" Height="80"   ScrollViewer.VerticalScrollBarVisibility="Visible"
+                  AcceptsReturn="True" TextWrapping="Wrap" VerticalContentAlignment="Top" IsReadOnly="True" BorderThickness="0"/>
+                    </Border>
 
                 </StackPanel>
             </Grid>
 
             <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
         </Grid>
-        <Grid Grid.Row="2">
-
-            <c:BButton Content="完成验收" Width="100"  HorizontalAlignment="Right"  VerticalAlignment="Stretch" Margin="0,2,19,2" 
-                    Command="{Binding CompeteQualityTaskCommand}"
+        <DockPanel Grid.Row="2">
+
+            <c:BButton Content="完成验收" Width="100" DockPanel.Dock="Right"    VerticalAlignment="Stretch" Margin="0,0,20,0"  HorizontalAlignment="Right"
+Command="{Binding CompeteQualityTaskCommand}"
+CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
+Background="{StaticResource  Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
+            <c:BButton Content="验收异常" Width="100" DockPanel.Dock="Right"    VerticalAlignment="Stretch"   HorizontalAlignment="Right"
+                    Command="{Binding QualityTaskExceptionCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
-                    Background="{StaticResource  Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
-        </Grid>
+                    Background=" #ec808d" BorderThickness="0" Foreground="White"/>
+           
+        </DockPanel>
         <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Row="1" VerticalAlignment="Bottom"/>
     </Grid>
     </c:BWindow>
\ No newline at end of file
diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs b/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs
index 97e9a9e0..950b840e 100644
--- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs
+++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml.cs
@@ -12,6 +12,7 @@ namespace BBWY.Client.Views.QualityTask
     {
         public QualityWindow(PackTaskModel model,Action ReflashTask)
         {
+            
             InitializeComponent();
         var qualityViewModel =(QualityViewModel)this.DataContext;
             if (qualityViewModel.ReflashWindow == null)