diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index bf8f6134..ed414065 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10160";
+            ClientVersion = "10161";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
index 2ced75b5..a4a53ef8 100644
--- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
@@ -70,6 +70,11 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public decimal TotalConsumableFees { get => totalConsumableFees; set { Set(ref totalConsumableFees, value); } }
 
+        private decimal totalFees;
+        /// <summary>
+        /// 总耗材费
+        /// </summary>
+        public decimal TotalFees { get => totalFees; set { Set(ref totalFees, value); } }
 
         public ICommand SetSearchDateCommand { get; set; }
 
@@ -221,6 +226,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     OrderCount = res.Data.TotalCount;
                     TotalConsumableFees = res.Data.TotalConsumableFees;
                     TotalPackDiscountFees = res.Data.TotalPackDiscountFees;
+                    TotalFees = TotalConsumableFees + TotalPackDiscountFees;
                     foreach (var shopTotal in res.Data.ShopTotals)
                     {
                         if (!shopTotal.ProcessComboName.IsNullOrEmpty())
diff --git a/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
index d7774617..4dbac35f 100644
--- a/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
@@ -62,6 +62,12 @@ namespace BBWY.Client.ViewModels.TotalPackTask
         /// </summary>
         public decimal TotalConsumableFees { get => totalConsumableFees; set { Set(ref totalConsumableFees, value); } }
 
+        private decimal totalFees;
+        /// <summary>
+        /// 总耗材费
+        /// </summary>
+        public decimal TotalFees { get => totalFees; set { Set(ref totalFees, value); } }
+
 
         public ICommand SetSearchDateCommand { get; set; }
 
@@ -155,6 +161,7 @@ namespace BBWY.Client.ViewModels.TotalPackTask
                     OrderCount = res.Data.TotalCount;
                     TotalConsumableFees = res.Data.TotalConsumableFees;
                     TotalPackDiscountFees = res.Data.TotalPackDiscountFees;
+                    TotalFees = TotalConsumableFees + TotalPackDiscountFees;
                     foreach (var shopTotal in res.Data.ShopTotals)
                     {
                         if (!shopTotal.ProcessComboName.IsNullOrEmpty())
diff --git a/BBWY.Client/Views/PackTask/PackTaskTotal.xaml b/BBWY.Client/Views/PackTask/PackTaskTotal.xaml
index 0afef43e..ad9cd1b4 100644
--- a/BBWY.Client/Views/PackTask/PackTaskTotal.xaml
+++ b/BBWY.Client/Views/PackTask/PackTaskTotal.xaml
@@ -103,23 +103,28 @@
 
                 </Grid>
 
-                <Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0"  Background="{StaticResource Button.Background}" Width="420"
+                <Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0"  Background="{StaticResource Button.Background}" Width="450"
                       Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
                       >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
+                        <ColumnDefinition Width="90"/>
                     </Grid.ColumnDefinitions>
-                    <StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
                         <TextBlock Text="包装服务费" Foreground="White"/>
                         <TextBlock Text="{Binding TotalPackDiscountFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
                     </StackPanel>
-                    <StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
                         <TextBlock Text="包装耗材费" Foreground="White"/>
                         <TextBlock Text="{Binding TotalConsumableFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
                     </StackPanel>
-                    <StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
+                        <TextBlock Text="总费用" Foreground="White"/>
+                        <TextBlock Text="{Binding TotalFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
+                    </StackPanel>
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="3">
                         <TextBlock Text="总任务量" Foreground="White"/>
                         <TextBlock Text="{Binding OrderCount}" Foreground="White" FontSize="20" FontWeight="Bold"/>
                     </StackPanel>
diff --git a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
index 9a75fb68..eecddbc1 100644
--- a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
+++ b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
@@ -208,9 +208,9 @@
                                             <ListBox.ItemTemplate>
                                                 <DataTemplate>
                                                     <Grid Width="180" Height="68">
-                                                        <TextBox  Text="{Binding  Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="180" Height="68"
+                                                        <TextBox  Text="{Binding  Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
                                                                  IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
-                                                        BorderThickness="0"     VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                            VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
 
                                                         </TextBox>
                                                         <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right"/>
@@ -280,14 +280,14 @@
                             </ListBox.ItemsPanel>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <Grid Width="200" Height="32">
+                                    <Grid Width="220" Height="32">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
-                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="80"/>
                                         </Grid.ColumnDefinitions>
                                         <TextBlock Text="{Binding WareName}" Style="{StaticResource middleTextBlock}"/>
 
-                                        <c:BButton Style="{StaticResource LinkButton}" Content="批量MAX" 
+                                        <c:BButton Style="{StaticResource LinkButton}" Content="批量MAX设置" 
                                                    CommandParameter="{Binding WareId}" Command="{Binding DataContext.BatchSetWareMaxCountCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}}}"
                                                    Grid.Column="1" HorizontalAlignment="Left"/>
                                         <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
@@ -379,14 +379,16 @@
                                         </ListBox.ItemsPanel>
                                         <ListBox.ItemTemplate>
                                             <DataTemplate>
-                                                <Grid Width="200" Height="68">
+                                                <Grid Width="220" Height="68">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition/>
                                                         <ColumnDefinition Width="50"/>
                                                     </Grid.ColumnDefinitions>
-                                                    <TextBox  Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="155" Height="68"
-                                                                  IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
-                                                        BorderThickness="0"    VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                    <TextBox  Text="{Binding  Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
+                                                                 IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
+                                                            VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
+
+                                                    </TextBox>
                                                     <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" Grid.Column="1"/>
                                                     <c:BButton Style="{StaticResource LinkButton}" Content="MAX" FontSize="14" Foreground="Gray"
                                                                 IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
@@ -455,19 +457,18 @@
                             </ListBox.ItemsPanel>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <Grid Width="155" Height="32">
+                                    <Grid Width="180" Height="32">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
-                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="80"/>
                                         </Grid.ColumnDefinitions>
                                         <TextBlock Text="{Binding WareName}" Style="{StaticResource middleTextBlock}"/>
 
-                                        <c:BButton Style="{StaticResource LinkButton}" Content="批量MAX" 
+                                        <c:BButton Style="{StaticResource LinkButton}" Content="批量MAX设置" 
                                                    CommandParameter="{Binding WareId}" Command="{Binding DataContext.BatchSetWareMaxCountCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}}}"
                                                    Grid.Column="1" HorizontalAlignment="Left"/>
                                         <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
                                     </Grid>
-
                                 </DataTemplate>
                             </ListBox.ItemTemplate>
                         </ListBox>
@@ -554,14 +555,16 @@
                                         </ListBox.ItemsPanel>
                                         <ListBox.ItemTemplate>
                                             <DataTemplate>
-                                                <Grid Width="155" Height="68">
+                                                <Grid Width="180" Height="68">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition/>
                                                         <ColumnDefinition Width="50"/>
                                                     </Grid.ColumnDefinitions>
-                                                    <TextBox  Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="155" Height="68"
-                                                                  IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
-                                                        BorderThickness="0"    VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                    <TextBox  Text="{Binding  Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
+                                                                 IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
+                                                            VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
+
+                                                    </TextBox>
                                                     <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" Grid.Column="1"/>
                                                     <c:BButton Style="{StaticResource LinkButton}" Content="MAX" FontSize="14" Foreground="Gray"
                                                                 IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
@@ -630,14 +633,14 @@
                             </ListBox.ItemsPanel>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <Grid Width="155" Height="32">
+                                    <Grid Width="180" Height="32">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
-                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="80"/>
                                         </Grid.ColumnDefinitions>
                                         <TextBlock Text="{Binding WareName}" Style="{StaticResource middleTextBlock}"/>
 
-                                        <c:BButton Style="{StaticResource LinkButton}" Content="批量MAX" 
+                                        <c:BButton Style="{StaticResource LinkButton}" Content="批量MAX设置" 
                                                    CommandParameter="{Binding WareId}" Command="{Binding DataContext.BatchSetWareMaxCountCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type c:BWindow}}}"
                                                    Grid.Column="1" HorizontalAlignment="Left"/>
                                         <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
@@ -723,14 +726,16 @@
                                         </ListBox.ItemsPanel>
                                         <ListBox.ItemTemplate>
                                             <DataTemplate>
-                                                <Grid Width="155" Height="68">
+                                                <Grid Width="180" Height="68">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition/>
                                                         <ColumnDefinition Width="50"/>
                                                     </Grid.ColumnDefinitions>
-                                                    <TextBox  Text="{Binding Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="0" Width="155" Height="68"
-                                                                  IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
-                                                        BorderThickness="0"    VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                    <TextBox  Text="{Binding  Count,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100" Height="30" BorderBrush="{StaticResource Border.Brush}"
+                                                                 IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
+                                                            VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">
+
+                                                    </TextBox>
                                                     <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" Grid.Column="1"/>
                                                     <c:BButton Style="{StaticResource LinkButton}" Content="MAX" FontSize="14" Foreground="Gray"
                                                                 IsEnabled="{Binding WareState,Converter={StaticResource objConverter},ConverterParameter=待封箱|#null:true:false}"
diff --git a/BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml b/BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml
index 6ae232b2..088a45da 100644
--- a/BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml
+++ b/BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml
@@ -100,23 +100,28 @@
 
                 </Grid>
 
-                <Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0"  Background="{StaticResource Button.Background}" Width="420"
+                <Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0"  Background="{StaticResource Button.Background}" Width="450"
                       Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
                       >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
                         <ColumnDefinition/>
+                        <ColumnDefinition Width="90"/>
                     </Grid.ColumnDefinitions>
-                    <StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
                         <TextBlock Text="包装服务费" Foreground="White"/>
                         <TextBlock Text="{Binding TotalPackDiscountFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
                     </StackPanel>
-                    <StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
                         <TextBlock Text="包装耗材费" Foreground="White"/>
                         <TextBlock Text="{Binding TotalConsumableFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
                     </StackPanel>
-                    <StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
+                        <TextBlock Text="总费用" Foreground="White"/>
+                        <TextBlock Text="{Binding TotalFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
+                    </StackPanel>
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="3">
                         <TextBlock Text="总任务量" Foreground="White"/>
                         <TextBlock Text="{Binding OrderCount}" Foreground="White" FontSize="20" FontWeight="Bold"/>
                     </StackPanel>