From 04101eb562ba5c1de66db850a90d72ec2a04e51b Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Thu, 14 Sep 2023 17:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 6 +- .../ViewModels/PackTask/TaskListViewModel.cs | 69 ++++++++++++++++++- .../Views/PackTask/TaskListControl.xaml | 30 ++++++-- 3 files changed, 95 insertions(+), 10 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 83bb5268..164a0e41 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -56,11 +56,13 @@ namespace BBWY.Client userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE"; //齐越山鸡 - // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + // 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; diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 3639782a..2e3ad807 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -293,9 +293,71 @@ namespace BBWY.Client.ViewModels.PackTask LoadSealBoxSkuDataCommand = new RelayCommand(LoadSealBoxSkuData); this.productService = productService; + + UpdateTaskStateCommand = new RelayCommand(UpdateTaskState); } + private void UpdateTaskState(object obj) + { + var model = (PackTaskModel)obj; + long taskId = model.TaskId; + var packTaskState = model.TaskState; + + ApiResponse 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) @@ -325,7 +387,7 @@ namespace BBWY.Client.ViewModels.PackTask break; case Models.TaskState.待落仓: { - if (SealBoxConfigureType== SealBoxConfigureType.待配置) + if (SealBoxConfigureType == SealBoxConfigureType.待配置) { if (obj is FallWareConfiguredModel) { @@ -517,7 +579,10 @@ namespace BBWY.Client.ViewModels.PackTask #region 事件绑定 - + /// + /// 修改任务状态 + /// + public ICommand UpdateTaskStateCommand { get; set; } public ICommand LoadSealBoxSkuDataCommand { get; set; } diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml index 7d33f522..f79c8438 100644 --- a/BBWY.Client/Views/PackTask/TaskListControl.xaml +++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml @@ -402,13 +402,31 @@ - - - + + + + + + + + + + + + + +