diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 72f1f302..7d7f200b 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10208"; + 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 /// 消息列表 /// public List MarkMessageModelList { get; set; } + public DateTime? TaskAbortTime { get; set; } } public class ExpressOrderResponse { @@ -238,5 +239,8 @@ namespace BBWY.Client.Models.APIModel /// 变更时间 /// public DateTime? ExpressChangedTime { get; set; } + + + } } diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs index 01ca6795..861fe02e 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs @@ -71,7 +71,7 @@ namespace BBWY.Client.Models.APIModel /// /// 任务Id /// - public long TaskIdRemark { get; set; } + public string TaskIdRemark { get; set; } /// /// 任务Id /// 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;