diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 158baadb..a0a6e27f 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 = "10228";
+            ClientVersion = "10229";
         }
 
 
diff --git a/BBWY.Client/Models/PackTask/ShopTotal.cs b/BBWY.Client/Models/PackTask/ShopTotal.cs
index 30114d12..645931be 100644
--- a/BBWY.Client/Models/PackTask/ShopTotal.cs
+++ b/BBWY.Client/Models/PackTask/ShopTotal.cs
@@ -2,6 +2,7 @@
 using BBWY.Client.ViewModels;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace BBWY.Client.Models.PackTask
@@ -106,8 +107,12 @@ namespace BBWY.Client.Models.PackTask
         // string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,打包原价,打包折扣系数,打包折扣价,总收费";
         public override string ToString()
         {
+            string ConsumableStr = string.Empty;
+            if (ConsumableList != null && ConsumableList.Count > 0)
+                ConsumableStr = string.Join(",", ConsumableList.Select(x => $"{x.ItemName} {x.ItemPrice}*{x.ItemCount}"));
+
             return $"{TaskId},{CreateTime?.ToString("MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
-                $",{SkuCount},{ArrivalQuantity},{ConsumableFees},{ProcessTypeName},{ProcessComboName},{ProcessComboPrice},{PackFees},{DiscountFactor},{PackDisCountFees},{AllFees}";
+                $",{SkuCount},{ArrivalQuantity},\"{ConsumableStr}\" ,{ConsumableFees},{ProcessTypeName},{ProcessComboName},{ProcessComboPrice},{PackFees},{DiscountFactor},{PackDisCountFees},{AllFees}";
         }
     }
 
diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
index a4a53ef8..01298dae 100644
--- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
@@ -148,7 +148,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 if (res.Success)
                 {
                     //string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
-                    string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
+                    string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材明细,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
                     var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
                     excelList.Insert(0, title);
                     System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
diff --git a/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
index 4dbac35f..7b359151 100644
--- a/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
@@ -134,7 +134,7 @@ namespace BBWY.Client.ViewModels.TotalPackTask
                 if (res.Success)
                 {
                     //string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
-                    string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
+                    string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材明细,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
                     var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
                     excelList.Insert(0, title);
                     System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
diff --git a/BBWY.Client/Views/PackagingTask/ShopWaitPackingTaskControl.xaml b/BBWY.Client/Views/PackagingTask/ShopWaitPackingTaskControl.xaml
index 608c8bda..0f71b660 100644
--- a/BBWY.Client/Views/PackagingTask/ShopWaitPackingTaskControl.xaml
+++ b/BBWY.Client/Views/PackagingTask/ShopWaitPackingTaskControl.xaml
@@ -267,7 +267,7 @@
                                             </StackPanel>
 
                                         </StackPanel>
-                                        <c:BButton Margin="0 10 0 0"    Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                        <!--<c:BButton Margin="0 10 0 0"    Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
                                                >
                                             <b:Interaction.Triggers>
                                                 <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
@@ -275,13 +275,13 @@
                                                         <b:InvokeCommandAction.CommandParameter>
                                                             <MultiBinding Converter="{StaticResource mptConverter}">
                                                                 <Binding Path="TaskId"/>
-                                                                <Binding Path="QualityOverTimeMarkMsg"/>
+                                                                <Binding Path="PackOverTimeMarkMsg"/>
                                                             </MultiBinding>
                                                         </b:InvokeCommandAction.CommandParameter>
                                                     </b:InvokeCommandAction>
                                                 </b:EventTrigger>
                                             </b:Interaction.Triggers>
-                                        </c:BButton>
+                                        </c:BButton>-->
                                     </StackPanel>
                                 </StackPanel>
 
@@ -455,15 +455,15 @@ Foreground="{StaticResource Text.Color}">
 
 
                             <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
-                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
                                    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
                                 <TextBlock.ToolTip>
                                     <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                        <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                        <TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
                                     </ToolTip>
                                 </TextBlock.ToolTip>
                                     <Run Text="超时原因:"/>
-                                    <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                    <Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
                                 </TextBlock>
 
 
diff --git a/BBWY.Client/Views/PackagingTask/WaitPackingTaskControl.xaml b/BBWY.Client/Views/PackagingTask/WaitPackingTaskControl.xaml
index 26c920fa..4f1e87e5 100644
--- a/BBWY.Client/Views/PackagingTask/WaitPackingTaskControl.xaml
+++ b/BBWY.Client/Views/PackagingTask/WaitPackingTaskControl.xaml
@@ -273,7 +273,7 @@
                                             </StackPanel>
 
                                         </StackPanel>
-                                        <c:BButton Margin="0 10 0 0"    Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+                                        <c:BButton Margin="0 10 0 0"    Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
                                                >
                                             <b:Interaction.Triggers>
                                                 <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
@@ -281,7 +281,7 @@
                                                         <b:InvokeCommandAction.CommandParameter>
                                                             <MultiBinding Converter="{StaticResource mptConverter}">
                                                                 <Binding Path="TaskId"/>
-                                                                <Binding Path="QualityOverTimeMarkMsg"/>
+                                                                <Binding Path="PackOverTimeMarkMsg"/>
                                                             </MultiBinding>
                                                         </b:InvokeCommandAction.CommandParameter>
                                                     </b:InvokeCommandAction>
@@ -557,15 +557,15 @@ Foreground="{StaticResource Text.Color}">
 
 
                             <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
-                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
                                    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
                                 <TextBlock.ToolTip>
                                     <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                        <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                        <TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
                                     </ToolTip>
                                 </TextBlock.ToolTip>
                                     <Run Text="超时原因:"/>
-                                    <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                    <Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
                                 </TextBlock>