打包端新增隔天超时提醒

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))

BBWY.Client/GlobalContext.cs

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

BBWY.Client/Models/APIModel/Response/PackUser/SearchPackerTaskResponse.cs

@@ -156,6 +156,11 @@ namespace BBWY.Client.Models.APIModel
         /// </summary>
         public List<MarkMessageModel> MarkMessageModelList { get; set; }
 
+        /// <summary>
+        /// 明天是否会超时
+        /// </summary>
+        public bool? IsOverTimeTomorrow { get; set; }
+
     }
 
     public class MarkMessageModel

BBWY.Client/Models/PackUser/PackerTaskModel.cs

@@ -8,6 +8,9 @@ namespace BBWY.Client.Models.PackUser
 {
     public class PackerTaskModel: PackerTaskData
     {
+
+
+
         private string packRemainTime;
         /// <summary>
         /// 打包剩余时间

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<PageArgs>(p =>
             {

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -751,6 +751,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
             SearchTaskCommand = new RelayCommand(() =>
             {
+                PageIndex = 1;
                 SearchTaskList();  //手动点击查询订单
             });
             TaskPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>

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(() =>

BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml

@@ -337,11 +337,15 @@
                                         <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
                              Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
                              >
-                                            <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+                                            <StackPanel Margin="10,5" Orientation="Vertical"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
                                      Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
                                  >
-                                                <TextBlock  Text="剩余: " />
+                                                <StackPanel Orientation="Horizontal">
-                                                <TextBlock  Text="{Binding  PackRemainTime}"/>
+                                                    <TextBlock  Text="剩余: " />
+                                                    <TextBlock  Text="{Binding  PackRemainTime}"/>
+                                                </StackPanel>
+                                                <TextBlock Text="今天未完成将超时" Foreground="Red"  Margin="0 10 0 0 "  Visibility="{Binding IsOverTimeTomorrow,Converter={StaticResource objConverter},ConverterParameter=True:Visible:Collapsed}"/>
+
                                             </StackPanel>
                                             <StackPanel Margin="10,5"  Orientation="Vertical"   VerticalAlignment="Center"  HorizontalAlignment="Center" 
                                   Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">