1

BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs

@@ -142,15 +142,6 @@ namespace BBWY.Client.Models.APIModel
 
         public string OrderId { get; set; }
 
-        ///// <summary>
-        /////分箱情况
-        ///// </summary>
-        //public WareHourseDTO[] WareHourses { get; set; }
-        /// <summary>
-        /// 地托编号
-        /// </summary>
-        public int? FloorDragNumber { get; set; }
-
         /// <summary>
         /// 质检超时时间
         /// </summary>
@@ -161,8 +152,6 @@ namespace BBWY.Client.Models.APIModel
         /// </summary>
         public DateTime? PackCompletionOverTime { get; set; }
 
-
-
         /// <summary>
         /// 质检超时备注信息
         /// </summary>
@@ -201,7 +190,6 @@ namespace BBWY.Client.Models.APIModel
         /// </summary>
         public DateTime? SendToSetSkuConfigureTime { get; set; }
 
-
         /// <summary>
         /// 物流状态
         /// </summary>
@@ -211,6 +199,27 @@ namespace BBWY.Client.Models.APIModel
         /// 消息列表
         /// </summary>
         public List<MarkMessageModel> MarkMessageModelList { get; set; }
+
+
+        /// <summary>
+        /// 异常类型
+        /// </summary>
+        public string TaskExceptionType { get; set; }
+
+        /// <summary>
+        /// 货架编号
+        /// </summary>
+        public string ShelvesNumber { get; set; }
+
+        /// <summary>
+        /// 货架层数
+        /// </summary>
+        public int? FloorNumber { get; set; }
+
+        /// <summary>
+        /// 挂起异常备注
+        /// </summary>
+        public string AbortRemark { get; set; }
     }
     public class ExpressOrderResponse
     {

BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs

@@ -71,7 +71,7 @@ namespace BBWY.Client.Models.APIModel
         /// <summary>
         /// 任务Id
         /// </summary>
-        public long TaskIdRemark { get; set; }
+        public string TaskIdRemark { get; set; }
         /// <summary>
         /// 任务Id
         /// </summary>

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -1264,7 +1264,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 {
 
 
-                    if (IsNeedCer == Need.需要)
+                    if (IsNeedCer == Need.需要|| !packTaskRes.Data.SkuPurchaseSchemeId.IsNullOrEmpty())//配件
                     {
                         QualityWindow service = new QualityWindow(model, ReflashTask, IsNeedCer, markType, packTaskRes.Data);
                         service.ShowDialog();

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -185,7 +185,8 @@
                 <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="包装需求" Grid.Column="4"  Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="包装需求" Grid.Column="4"  Style="{StaticResource middleTextBlock}" Visibility="{Binding TaskState, Converter={StaticResource objConverter},ConverterParameter=部分到货:Collapsed:Visible}" />
+                <TextBlock Text="摆放货架" Grid.Column="4"  Style="{StaticResource middleTextBlock}" Visibility="{Binding TaskState, Converter={StaticResource objConverter},ConverterParameter=部分到货:Visible:Collapsed}" />
                 <TextBlock Text="物流信息"   Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
                 <!--<TextBlock Text="注意事项/对接备注" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>-->
                 <TextBlock Text="费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>