diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index cec3c48c..8facce1c 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 = "10172"; + ClientVersion = "10173"; } private User user; diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs index bcedf94a..6c08fd14 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs @@ -67,7 +67,7 @@ namespace BBWY.Client.Models.APIModel public class SealBoxSku { - + public DateTime? CreateTime { get; set; } /// /// 任务Id /// diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs index a42d459d..cc19678e 100644 --- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs @@ -67,6 +67,8 @@ namespace BBWY.Client.Models.APIModel public class WareSealBoxSku { + public DateTime? CreateTime { get; set; } + public TaskState TaskState { get; set; } /// /// 任务Id diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs index aeb70a6b..e574e294 100644 --- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs @@ -52,6 +52,8 @@ namespace BBWY.Client.Models.APIModel public class WareNoSealBoxSku { + public DateTime? CreateTime { get; set; } + /// /// 任务Id /// diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs index 57b8638d..14c466cb 100644 --- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs @@ -73,7 +73,7 @@ namespace BBWY.Client.Models.APIModel } public class WaitTransportSku { - + public DateTime? CreateTime { get; set; } ///// ///// 任务状态 ///// diff --git a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml index 1093d504..ecb4227e 100644 --- a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml +++ b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml @@ -203,12 +203,14 @@ - + + - + diff --git a/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml b/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml index 4ad18bb5..1ec74bbf 100644 --- a/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml +++ b/BBWY.Client/Views/PackTask/WaitCompletedControl.xaml @@ -254,7 +254,21 @@ CommandParameter="{Binding ProductNo}" Margin=" 5,0,0,0"/> --> - + + + + + + + + + + + + diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml index 2e6b495e..835650c4 100644 --- a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml @@ -193,12 +193,14 @@ - + + - + diff --git a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml index 9c171c99..4130954d 100644 --- a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml +++ b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml @@ -210,12 +210,13 @@ - + - + diff --git a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml index 94ae4607..f10bdca6 100644 --- a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml +++ b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml @@ -210,7 +210,19 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" CommandParameter="{Binding ProductNo}" Margin=" 5,0,0,0"/> --> - + + + + + + + + + +