From 6f77db01f8868489c63cc8523ca695d8203b491e Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 5 Nov 2023 17:46:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=9A=94=E5=A4=A9=E8=B6=85=E6=97=B6=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 4 +++- BBWY.Client/GlobalContext.cs | 2 +- .../Response/PackUser/SearchPackerTaskResponse.cs | 5 +++++ BBWY.Client/Models/PackUser/PackerTaskModel.cs | 3 +++ BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs | 3 ++- .../ViewModels/PackTask/WareHouseListViewModel.cs | 1 + .../ViewModels/PackerTask/PackerTaskViewModel.cs | 3 --- .../Views/PackerTask/PackerWaitPackageControl.xaml | 10 +++++++--- 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 5ab027b8..a1af49d4 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -73,7 +73,9 @@ namespace BBWY.Client //齐越琳琳 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U"; + // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U"; + //齐越季夏 + // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjIyNzY3NTkzODM0MTU2MDMyIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTE2NzE1MzcyNDQ1NzAwMDk2LDE3MTg1NDEwNjMzOTc4Mzg4NDgiLCJleHAiOjE3MzAyODcxNjh9.ZGBU0MoJbKdkgqe9x2e3l6q-AVZwfAkUwa3oB47PWhY"; #else //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty; //if (string.IsNullOrEmpty(uid)) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 74a3ba08..d530aed6 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 = "10198"; + ClientVersion = "10199"; } diff --git a/BBWY.Client/Models/APIModel/Response/PackUser/SearchPackerTaskResponse.cs b/BBWY.Client/Models/APIModel/Response/PackUser/SearchPackerTaskResponse.cs index 87289485..ec75adfc 100644 --- a/BBWY.Client/Models/APIModel/Response/PackUser/SearchPackerTaskResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackUser/SearchPackerTaskResponse.cs @@ -156,6 +156,11 @@ namespace BBWY.Client.Models.APIModel /// public List MarkMessageModelList { get; set; } + /// + /// 明天是否会超时 + /// + public bool? IsOverTimeTomorrow { get; set; } + } public class MarkMessageModel diff --git a/BBWY.Client/Models/PackUser/PackerTaskModel.cs b/BBWY.Client/Models/PackUser/PackerTaskModel.cs index 64051e5b..4ce05ed8 100644 --- a/BBWY.Client/Models/PackUser/PackerTaskModel.cs +++ b/BBWY.Client/Models/PackUser/PackerTaskModel.cs @@ -8,6 +8,9 @@ namespace BBWY.Client.Models.PackUser { public class PackerTaskModel: PackerTaskData { + + + private string packRemainTime; /// /// 打包剩余时间 diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index e0490434..d32a3904 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -367,7 +367,8 @@ namespace BBWY.Client.ViewModels.PackTask CreateTaskCommand = new RelayCommand(CreateTask); SearchTaskCommand = new RelayCommand(() => { - Task.Factory.StartNew(() => SearchTaskList()); //手动点击查询订单 + PageIndex = 1; + SearchTaskList(); //手动点击查询订单 }); TaskPageIndexChangedCommand = new RelayCommand(p => { diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 46eebddd..f4d9513c 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -751,6 +751,7 @@ namespace BBWY.Client.ViewModels.PackTask SearchTaskCommand = new RelayCommand(() => { + PageIndex = 1; SearchTaskList(); //手动点击查询订单 }); TaskPageIndexChangedCommand = new RelayCommand(p => diff --git a/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs b/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs index 03baaa99..fe86fa6a 100644 --- a/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs @@ -615,9 +615,6 @@ namespace BBWY.Client.ViewModels.PackerTask data.IsPackOverTime = false; data.PackRemainTime = OverTimeHelper.GetTimeString(item.PackCompletionTime.Value.Subtract(item.SetPackUserTaskTime.Value)); } - - - } App.Current.Dispatcher.Invoke(() => diff --git a/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml b/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml index 7b38d4a9..31560739 100644 --- a/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml +++ b/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml @@ -337,11 +337,15 @@ - - - + + + + + +