diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 5536e8a6..593d6493 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -577,7 +577,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         private void SendToSetSkuConfigure(PackTaskModel model)
         {
-            if (model.SendToSetSkuConfigureTime!=null)
+            if (model.SendToSetSkuConfigureTime != null)
             {
                 System.Windows.MessageBox.Show($"已提醒配置，提醒时间：{model.SendToSetSkuConfigureTime}，请耐心等待");
                 return;
@@ -1158,7 +1158,6 @@ namespace BBWY.Client.ViewModels.PackTask
             else
                 PageIndex = 1;
         }
-
         private bool IsStartThread = false;
         private Thread qualityOverTimeThread = null;
         private Thread packOverTimeThread = null;
@@ -1171,7 +1170,9 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public void SearchTaskList()
         {
-
+            if (IsLoading)
+                return;
+            IsLoading = true;
             PageSize = 10;
             IsStartThread = false;
             long? taskId = null;
@@ -1192,12 +1193,9 @@ namespace BBWY.Client.ViewModels.PackTask
                 taskId = null;
 
             }
-            IsLoading = true;
-
-
-            if (TaskState == Models.TaskState.待出库)
+            Task.Factory.StartNew(() =>
             {
-                Task.Factory.StartNew(() =>
+                if (TaskState == Models.TaskState.待出库)
                 {
                     WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
                     var datas = sealBoxService.GetWareWaitCompletedList(null, SearchShopName, taskId, SearchSkuId, sealBoxId, PageIndex, PageSize);
@@ -1220,13 +1218,11 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
                     IsLoadCount();
                     IsLoading = false;
-                });
-            }
-            else if (TaskState == Models.TaskState.已超时)
-            {
-                PageSize = 20;
-                Task.Factory.StartNew(() =>
+
+                }
+                else if (TaskState == Models.TaskState.已超时)
                 {
+                    PageSize = 20;
                     OverTimeTaskList = new ObservableCollection<OverTimeTaskResponse>();
                     var datas = packTaskService.SearchOverTimeTaskList(null, StartTime, EndTime, OverTimeTaskState, OverTimeTaskType, PageIndex, PageSize);
                     if (datas != null && datas.Data != null && datas.Success)
@@ -1248,12 +1244,12 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
                     IsLoadCount();
                     IsLoading = false;
-                });
-            }
-            else if (TaskState == Models.TaskState.待转运)
-            {
-                Task.Factory.StartNew(() =>
+
+                }
+                else if (TaskState == Models.TaskState.待转运)
                 {
+
+
                     WaitTransportList = new ObservableCollection<WareWaitTransport>();
                     var datas = sealBoxService.GetWareWaitTransportList(SelectWareType, PageSize, PageIndex);
                     if (datas != null && datas.Data != null && datas.Success)
@@ -1315,10 +1311,9 @@ namespace BBWY.Client.ViewModels.PackTask
                     IsLoadCount();
                     IsLoadWaitTransportCount();
                     IsLoading = false;
-                });
-            }
-            else if (TaskState == Models.TaskState.待落仓)
-                Task.Factory.StartNew(() =>
+
+                }
+                else if (TaskState == Models.TaskState.待落仓)
                 {
 
 
@@ -1360,9 +1355,8 @@ namespace BBWY.Client.ViewModels.PackTask
                     IsLoadFallWareCount();
                     IsLoading = false;
 
-                });
-            else if (TaskState == Models.TaskState.待封箱)
-                Task.Factory.StartNew(() =>
+                }
+                else if (TaskState == Models.TaskState.待封箱)
                 {
 
 
@@ -1486,11 +1480,9 @@ namespace BBWY.Client.ViewModels.PackTask
                     IsLoadCount();
                     IsLoading = false;
 
-                });
-            else
-                Task.Factory.StartNew(() =>
+                }
+                else
                 {
-
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
                     var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, SearchSpuId, SearchOrderSn, this.TaskState, SearchShopName,
@@ -1538,7 +1530,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                 ScheduleOverTime = item.ScheduleOverTime,
                                 PackProcessType = item.PackProcessType,
                                 ShopId = item.ShopId,
-                                SendToSetSkuConfigureTime=  item.SendToSetSkuConfigureTime,
+                                SendToSetSkuConfigureTime = item.SendToSetSkuConfigureTime,
 
                             };
 
@@ -1700,11 +1692,6 @@ namespace BBWY.Client.ViewModels.PackTask
                             var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待排单 && p.ScheduleOverTime != null).ToList();
                             if (packCompletedTasks.Count() > 0)
                             {
-                                //if (packOverTimeThread!=null)
-                                //{
-                                //    packOverTimeThread.Abort();
-                                //}
-
                                 scheduleOverTimeThread = new Thread(() =>
                                 {
                                     IsStartThread = true;
@@ -1749,10 +1736,10 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
                     IsLoadCount();
                     IsLoading = false;
-                });
-
 
+                }
 
+            });
 
         }
 
diff --git a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
index 5e702f09..eecf6fc6 100644
--- a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
+++ b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
@@ -228,29 +228,26 @@
                                                 >
                                         <StackPanel Orientation="Horizontal" >
                                             <TextBlock  Foreground="Red"  Text="超时: "/>
-                                        <TextBlock  Foreground="Red"  Text="{Binding  FallWareRemainTime}"/>
-
+                                            <TextBlock  Foreground="Red"  Text="{Binding  FallWareRemainTime}"/>
                                         </StackPanel>
-
-                                      
-                                        <c:BButton Margin="0 10 0 0"    Content="{Binding SetPurchaseOrderOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                    </StackPanel>
+                                    <c:BButton Margin="0 10 0 0"    Content="{Binding SetPurchaseOrderOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
                                      
                                                    >
-                                            <b:Interaction.Triggers>
-                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                    <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-                                                        <b:InvokeCommandAction.CommandParameter>
-                                                            <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                <Binding Path="SealBoxId"/>
-                                                                <Binding Path="SetPurchaseOrderOverTimeMarkMsg"/>
-                                                            </MultiBinding>
-                                                        </b:InvokeCommandAction.CommandParameter>
-                                                    </b:InvokeCommandAction>
-                                                </b:EventTrigger>
-                                            </b:Interaction.Triggers>
-                                        </c:BButton>
+                                        <b:Interaction.Triggers>
+                                            <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                    <b:InvokeCommandAction.CommandParameter>
+                                                        <MultiBinding Converter="{StaticResource mptConverter}">
+                                                            <Binding Path="SealBoxId"/>
+                                                            <Binding Path="SetPurchaseOrderOverTimeMarkMsg"/>
+                                                        </MultiBinding>
+                                                    </b:InvokeCommandAction.CommandParameter>
+                                                </b:InvokeCommandAction>
+                                            </b:EventTrigger>
+                                        </b:Interaction.Triggers>
+                                    </c:BButton>
 
-                                    </StackPanel>
                                 </StackPanel>
 
                             </Grid>
diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
index c94ae8ac..1b5b5698 100644
--- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
@@ -250,34 +250,8 @@
                                     <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
                                         <TextBlock  VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0"  />
                                         <TextBlock  VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
-
-
                                     </StackPanel>
-                                    <!--<StackPanel Orientation="Horizontal" Visibility="{Binding QualityRemainTime, Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
-
-                                    <TextBlock Foreground="Red"  VerticalAlignment="Center" Text="{Binding QualityRemainTime}" Margin="20,0,0,0" />
-
-
-                                </StackPanel>-->
-
                                 </StackPanel>
-                                <!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
-                                <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
-                                 Style="{StaticResource LinkButton}"       Content="取消任务" Margin="0 5 0 5 "
-                                            Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
-                                           
-                                           />
-                            </StackPanel>-->
-                                <!--<StackPanel Grid.Column="9" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
-                                        >
-                                -->
-                                <!-- -->
-                                <!--
-                                <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
-                                <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
-                                   Margin="5,0,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>
-                            </StackPanel>-->
                             </Grid>
                             <Grid Grid.Row="1">
                                 <Grid.RowDefinitions>
@@ -556,25 +530,25 @@
                                                     <TextBlock  Foreground="Red"  Text="超时: "/>
                                                     <TextBlock  Foreground="Red"  Text="{Binding  PackRemainTime}"/>
                                                 </StackPanel>
-                                                <c:BButton Margin="0 10 0 0"    Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                            </StackPanel>
+                                            <c:BButton Margin="0 10 0 0"    Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
                                                     
                                                     CommandParameter="{Binding TaskId}"
                                                    
                                                    >
-                                                    <b:Interaction.Triggers>
-                                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                            <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-                                                                <b:InvokeCommandAction.CommandParameter>
-                                                                    <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                        <Binding Path="TaskId"/>
-                                                                        <Binding Path="PackOverTimeMarkMsg"/>
-                                                                    </MultiBinding>
-                                                                </b:InvokeCommandAction.CommandParameter>
-                                                            </b:InvokeCommandAction>
-                                                        </b:EventTrigger>
-                                                    </b:Interaction.Triggers>
-                                                </c:BButton>
-                                            </StackPanel>
+                                                <b:Interaction.Triggers>
+                                                    <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                        <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                            <b:InvokeCommandAction.CommandParameter>
+                                                                <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                    <Binding Path="TaskId"/>
+                                                                    <Binding Path="PackOverTimeMarkMsg"/>
+                                                                </MultiBinding>
+                                                            </b:InvokeCommandAction.CommandParameter>
+                                                        </b:InvokeCommandAction>
+                                                    </b:EventTrigger>
+                                                </b:Interaction.Triggers>
+                                            </c:BButton>
                                         </StackPanel>
                                     </StackPanel>
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
@@ -596,41 +570,37 @@
                                                     <TextBlock  Foreground="Red"  Text="超时: "/>
                                                     <TextBlock  Foreground="Red"  Text="{Binding  ScheduleRemainTime}"/>
                                                 </StackPanel>
-                                                <c:BButton Margin="0 10 0 0"    Content="{Binding ScheduleOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                            </StackPanel>
+                                            <c:BButton Margin="0 10 0 0"    Content="{Binding ScheduleOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
                                                     
                                                    >
-                                                    <b:Interaction.Triggers>
-                                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                            <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-                                                                <b:InvokeCommandAction.CommandParameter>
-                                                                    <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                        <Binding Path="TaskId"/>
-                                                                        <Binding Path="ScheduleOverTimeMarkMsg"/>
-                                                                    </MultiBinding>
-                                                                </b:InvokeCommandAction.CommandParameter>
-                                                            </b:InvokeCommandAction>
-                                                        </b:EventTrigger>
-                                                    </b:Interaction.Triggers>
-                                                </c:BButton>
-                                            </StackPanel>
+                                                <b:Interaction.Triggers>
+                                                    <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                        <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                            <b:InvokeCommandAction.CommandParameter>
+                                                                <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                    <Binding Path="TaskId"/>
+                                                                    <Binding Path="ScheduleOverTimeMarkMsg"/>
+                                                                </MultiBinding>
+                                                            </b:InvokeCommandAction.CommandParameter>
+                                                        </b:InvokeCommandAction>
+                                                    </b:EventTrigger>
+                                                </b:Interaction.Triggers>
+                                            </c:BButton>
+
                                         </StackPanel>
                                     </StackPanel>
                                 </Grid>
-                                
+
 
 
                                 <Grid Grid.Column="10" >
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-
-
-
-
                                         <c:BButton HorizontalAlignment="Center" Height="20"  Style="{StaticResource LinkButton}"  VerticalAlignment="Center"  Grid.Row="1"  
                                                    Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }" 
                                                    Command="{Binding SetServiceCommand}"
                                                     Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已取消|未到货|部分到货|待验收|:Collapsed:Visible}" 
                                                     />
-
                                         <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="验收" 
                                                    Command="{Binding QualityTaskCommand}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" 
@@ -664,7 +634,7 @@
                                                   Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待打包:Visible:Collapsed}" 
                                                     />
-                                        <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0"   HorizontalAlignment="Stretch">  
+                                        <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0"   HorizontalAlignment="Stretch">
                                             <hc:SplitButton.Resources>
                                                 <ResourceDictionary>
                                                     <ResourceDictionary.MergedDictionaries>
@@ -696,7 +666,7 @@
                                        AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
                                 </Border>
                                 <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
-       
+
                                 <!--<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"/>
diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
index f49378fd..5da96d5a 100644
--- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
@@ -455,7 +455,6 @@
 
                                     </StackPanel>
                                 </Grid>
-
                                 <Grid Grid.Column="6" >
 
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"  
@@ -476,22 +475,23 @@
                                                     <TextBlock  Foreground="Red"  Text="超时: "/>
                                                     <TextBlock  Foreground="Red"  Text="{Binding  QualityRemainTime}"/>
                                                 </StackPanel>
-                                                <c:BButton Margin="0 10 0 0"    Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
-                                                   >
-                                                    <b:Interaction.Triggers>
-                                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                            <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-                                                                <b:InvokeCommandAction.CommandParameter>
-                                                                    <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                        <Binding Path="TaskId"/>
-                                                                        <Binding Path="QualityOverTimeMarkMsg"/>
-                                                                    </MultiBinding>
-                                                                </b:InvokeCommandAction.CommandParameter>
-                                                            </b:InvokeCommandAction>
-                                                        </b:EventTrigger>
-                                                    </b:Interaction.Triggers>
-                                                </c:BButton>
+                                               
                                             </StackPanel>
+                                            <c:BButton Margin="0 10 0 0"    Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                                   >
+                                                <b:Interaction.Triggers>
+                                                    <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                        <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                            <b:InvokeCommandAction.CommandParameter>
+                                                                <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                    <Binding Path="TaskId"/>
+                                                                    <Binding Path="QualityOverTimeMarkMsg"/>
+                                                                </MultiBinding>
+                                                            </b:InvokeCommandAction.CommandParameter>
+                                                        </b:InvokeCommandAction>
+                                                    </b:EventTrigger>
+                                                </b:Interaction.Triggers>
+                                            </c:BButton>
                                         </StackPanel>
                                     </StackPanel>
 
diff --git a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
index f0efdf81..67535b76 100644
--- a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
+++ b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
@@ -277,23 +277,23 @@
                                             <TextBlock  Foreground="Red"  Text="超时: "/>
                                             <TextBlock  Foreground="Red"  Text="{Binding  SealBoxRemainTime}"/>
                                         </StackPanel>
-                                       
-                                        <c:BButton Margin="0 10 0 0"    Content="{Binding SealBoxPackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
-                                                   >
-                                            <b:Interaction.Triggers>
-                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                    <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-                                                        <b:InvokeCommandAction.CommandParameter>
-                                                            <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                <Binding Path="SealBoxId"/>
-                                                                <Binding Path="SealBoxPackOverTimeMarkMsg"/>
-                                                            </MultiBinding>
-                                                        </b:InvokeCommandAction.CommandParameter>
-                                                    </b:InvokeCommandAction>
-                                                </b:EventTrigger>
-                                            </b:Interaction.Triggers>
-                                        </c:BButton>
+
                                     </StackPanel>
+                                    <c:BButton Margin="0 10 0 0"    Content="{Binding SealBoxPackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                                   >
+                                        <b:Interaction.Triggers>
+                                            <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                    <b:InvokeCommandAction.CommandParameter>
+                                                        <MultiBinding Converter="{StaticResource mptConverter}">
+                                                            <Binding Path="SealBoxId"/>
+                                                            <Binding Path="SealBoxPackOverTimeMarkMsg"/>
+                                                        </MultiBinding>
+                                                    </b:InvokeCommandAction.CommandParameter>
+                                                </b:InvokeCommandAction>
+                                            </b:EventTrigger>
+                                        </b:Interaction.Triggers>
+                                    </c:BButton>
 
                                 </StackPanel>
 
diff --git a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
index c426eabe..460cd2fe 100644
--- a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
+++ b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
@@ -109,7 +109,7 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding WareName}"
                                                                    Margin=" 5,0,7,0"/>
-                                
+
 
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
                                 <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -275,22 +275,23 @@
                                             <TextBlock  Foreground="Red"  Text="超时: "/>
                                             <TextBlock  Foreground="Red"  Text="{Binding  WaitTransportRemainTime}"/>
                                         </StackPanel>
-                                        <c:BButton Margin="0 10 0 0"    Content="{Binding TransportOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
-                                                   >
-                                            <b:Interaction.Triggers>
-                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                    <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-                                                        <b:InvokeCommandAction.CommandParameter>
-                                                            <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                <Binding Path="SealBoxId"/>
-                                                                <Binding Path="TransportOverTimeMarkMsg"/>
-                                                            </MultiBinding>
-                                                        </b:InvokeCommandAction.CommandParameter>
-                                                    </b:InvokeCommandAction>
-                                                </b:EventTrigger>
-                                            </b:Interaction.Triggers>
-                                        </c:BButton>
                                     </StackPanel>
+                                    <c:BButton Margin="0 10 0 0"    Content="{Binding TransportOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                                   >
+                                        <b:Interaction.Triggers>
+                                            <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                    <b:InvokeCommandAction.CommandParameter>
+                                                        <MultiBinding Converter="{StaticResource mptConverter}">
+                                                            <Binding Path="SealBoxId"/>
+                                                            <Binding Path="TransportOverTimeMarkMsg"/>
+                                                        </MultiBinding>
+                                                    </b:InvokeCommandAction.CommandParameter>
+                                                </b:InvokeCommandAction>
+                                            </b:EventTrigger>
+                                        </b:Interaction.Triggers>
+                                    </c:BButton>
+
                                 </StackPanel>
 
                             </Grid>