Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10208";
+            ClientVersion = "10210";
         }
 
 

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

@@ -211,6 +211,7 @@ namespace BBWY.Client.Models.APIModel
         /// 消息列表
         /// </summary>
         public List<MarkMessageModel> MarkMessageModelList { get; set; }
+        public DateTime? TaskAbortTime { get; set; }
     }
     public class ExpressOrderResponse
     {
@@ -238,5 +239,8 @@ namespace BBWY.Client.Models.APIModel
         /// 变更时间
         /// </summary>
         public DateTime? ExpressChangedTime { get; set; }
+
+
+
     }
 }

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

@@ -1122,7 +1122,7 @@ namespace BBWY.Client.ViewModels.PackTask
                         {
 
 
-                            if (IsPassInspection)//验收过 跳过询问
+                            if (IsPassInspection||model.TaskAbortTime != null)//验收过 跳过询问
                             {
                                 isqualityCer = true;
                                 return;