业务端新增确认收货

BBWY.Client/App.xaml.cs

@@ -58,9 +58,11 @@ namespace BBWY.Client
             //齐越山鸡
             // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
+            //飞鱼
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI3NDg2MDI0Mjk0NzMxNzc2IiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNTE2OTc0MjUwNTQyNTAxODg4IiwiZXhwIjoxNzI0NTY1ODU5fQ._ezJmsvaStab8nDPB7qeoc2aakWfhHbeqq_X_RQsc4s";
 
             //齐越陈默
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM";
+            // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM";
 
 #else
             //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -293,9 +293,71 @@ namespace BBWY.Client.ViewModels.PackTask
 
             LoadSealBoxSkuDataCommand = new RelayCommand<object>(LoadSealBoxSkuData);
             this.productService = productService;
+
+            UpdateTaskStateCommand = new RelayCommand<object>(UpdateTaskState);
+        }
+        private void UpdateTaskState(object obj)
+        {
+            var model = (PackTaskModel)obj;
+            long taskId = model.TaskId;
+            var packTaskState = model.TaskState;
+
+            ApiResponse<object> res = null;
+
+
+            if (!model.OrderId.IsNullOrEmpty())
+            {
+                System.Windows.MessageBox.Show("无法确认采购订单任务数据");
+                return;
+            }
+
+
+
+            switch (packTaskState)
+            {
+                case Models.TaskState.未到货:
+                case Models.TaskState.部分到货:
+
+
+                    //if (!model.OrderId.IsNullOrEmpty())
+                    //{
+                    //    if (model.ExpressOrderList == null || model.ExpressOrderList.Count <= 0)
+                    //    {
+                    //        System.Windows.MessageBox.Show("该任务采购单未进行发货,请联系业务进行发货后在确认收货", "提示");
+                    //        return;
+                    //    }
+                    //}
+                    if (System.Windows.MessageBox.Show("是否确认收货?", "提示",
+                                  MessageBoxButton.YesNo,
+                                  MessageBoxImage.Warning) != MessageBoxResult.Yes)
+                        return;
+
+
+
+
+                    //if (!model.OrderId.IsNullOrEmpty())
+                    //{
+                    //    var manualSigns = packTaskService.BatchManualSign(model.ExpressOrderList.Select(e => e.WaybillNo).ToArray());
+                    //    if (manualSigns == null || !manualSigns.Success)
+                    //    {
+                    //        if (!manualSigns.Success)
+                    //        {
+                    //            System.Windows.MessageBox.Show($"B端确认收货失败,{manualSigns.Msg}");
+                    //            return;
+                    //        }
+                    //    }
+                    //}
+                    res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待验收);
+                    break;
+            }
+            if (res != null && res.Success)
+            {
+                SearchTaskList();
             }
 
 
+        }
+
         public void LoadSealBoxSkuData(object obj)
         {
             switch (TaskState.Value)
@@ -517,7 +579,10 @@ namespace BBWY.Client.ViewModels.PackTask
 
         #region 事件绑定
 
-
+        /// <summary>
+        /// 修改任务状态
+        /// </summary>
+        public ICommand UpdateTaskStateCommand { get; set; }
 
         public ICommand LoadSealBoxSkuDataCommand { get; set; }
 

BBWY.Client/Views/PackTask/TaskListControl.xaml

@@ -402,13 +402,31 @@
                                 </Grid>
                             </Grid>
                             <Grid Grid.Column="9" >
-                                <StackPanel Grid.Column="11" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" 
+                                <StackPanel Grid.Column="11" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                                    <StackPanel  Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" 
   Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
         >
                                         <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
                                         <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
    Margin="0,10,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>
                                     </StackPanel>
+                                    <Grid Margin="0 10 0 0 " 
+                                   
+Visibility="{Binding OrderId,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}" 
+>
+
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="确认收货" 
+        Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" 
+             CommandParameter="{Binding}"
+       Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+       >
+
+                                        </c:BButton>
+
+                                    </Grid>
+
+                                </StackPanel>
+                               
                             </Grid>
 
                             <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"