From 2db9b64308dae0b4d0ce5cd0d20e05947daea2d0 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 24 Nov 2023 17:39:33 +0800
Subject: [PATCH] =?UTF-8?q?10210.=E5=BC=BA=E5=88=B6=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=AF=813c=E6=8C=82=E8=B5=B7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                                  | 2 +-
 .../APIModel/Response/PackTask/SearchTaskListResponse.cs      | 4 ++++
 BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index b9a1dc3a..7d7f200b 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 = "10209";
+            ClientVersion = "10210";
         }
 
 
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
index 83516da6..3345dcc1 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
+++ b/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; }
+
+
+
     }
 }
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 15add704..e896543e 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/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;