From 633a671ab7d9ea7aff4e9b9061f69b4875296da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E8=81=AA?= Date: Thu, 14 Sep 2023 12:34:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=BB=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/APIServices/BaseApiService.cs | 2 +- BBWY.Server.Business/Order/OrderBusiness.cs | 75 +++++++++++++++++---- 2 files changed, 63 insertions(+), 14 deletions(-) diff --git a/BBWY.Client/APIServices/BaseApiService.cs b/BBWY.Client/APIServices/BaseApiService.cs index 668f3b35..fb3e0757 100644 --- a/BBWY.Client/APIServices/BaseApiService.cs +++ b/BBWY.Client/APIServices/BaseApiService.cs @@ -41,7 +41,7 @@ namespace BBWY.Client.APIServices if (!headers.ContainsKey("qy")) headers.Add("qy", "qy"); - var result = restApiService.SendRequest(apiHost, apiPath, param, headers, httpMethod, contentType, paramPosition, enableRandomTimeStamp); + var result = restApiService.SendRequest(apiHost, apiPath, param, headers, httpMethod, contentType, paramPosition, enableRandomTimeStamp,timeOutSeconds:120); if (result.StatusCode != System.Net.HttpStatusCode.OK && result.Content.Contains("\"Success\"") && result.Content.Contains("\"Msg\"") && diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 369e264f..862ca2cc 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -305,19 +305,68 @@ namespace BBWY.Server.Business }); var orderIdList = orderSourceList.Select(o => o.OrderId).ToList(); - var orderSkuList = fsql.Select().Where(osku => osku.Price != 0 && orderIdList.Contains(osku.OrderId)).ToList(); - var orderCostDetailGroup = fsql.Select().Where(ocd => orderIdList.Contains(ocd.OrderId) && ocd.IsEnabled == true) - .GroupBy(ocd => ocd.OrderId).ToList(g => new - { - OrderId = g.Key, - SkuAmount = g.Sum(g.Value.SkuAmount), - FirstFreight = g.Sum(g.Value.FirstFreight), - StorageAmount = g.Sum(g.Value.StorageAmount), - PurchaseFreight = g.Sum(g.Value.PurchaseFreight), - ConsumableAmount = g.Sum(g.Value.ConsumableAmount), - InStorageAmount = g.Sum(g.Value.InStorageAmount), - OutStorageAmount = g.Sum(g.Value.OutStorageAmount) - }); + List orderSkuList = null; + if (orderIdList.Count() < 2000) + { + orderSkuList = fsql.Select().Where(osku => osku.Price != 0 && orderIdList.Contains(osku.OrderId)) + .ToList(osku => new OrderSku + { + Id = osku.Id, + OrderId = osku.OrderId, + SkuId = osku.SkuId + }); + } + else + { + orderSkuList = fsql.Select().InnerJoin((osku, o) => osku.OrderId == o.Id) + .Where((osku, o) => o.ShopId == searchOrderRequest.ShopId.Value && + o.StartTime >= searchOrderRequest.StartDate && + o.StartTime <= searchOrderRequest.EndDate) + .ToList((osku, o) => new OrderSku + { + Id = osku.Id, + OrderId = osku.OrderId, + SkuId = osku.SkuId + }); + } + + IList orderCostDetailGroup = null; + if (orderIdList.Count() < 2000) + { + orderCostDetailGroup = fsql.Select().Where(ocd => orderIdList.Contains(ocd.OrderId) && ocd.IsEnabled == true) + .GroupBy(ocd => ocd.OrderId).ToList(g => new OrderCostDetail + { + OrderId = g.Key, + SkuAmount = g.Sum(g.Value.SkuAmount), + FirstFreight = g.Sum(g.Value.FirstFreight), + StorageAmount = g.Sum(g.Value.StorageAmount), + PurchaseFreight = g.Sum(g.Value.PurchaseFreight), + ConsumableAmount = g.Sum(g.Value.ConsumableAmount), + InStorageAmount = g.Sum(g.Value.InStorageAmount), + OutStorageAmount = g.Sum(g.Value.OutStorageAmount) + }); + } + else + { + orderCostDetailGroup = fsql.Select().InnerJoin((ocd, o) => ocd.OrderId == o.Id) + .Where((ocd, o) => o.ShopId == searchOrderRequest.ShopId.Value && + o.StartTime >= searchOrderRequest.StartDate && + o.StartTime <= searchOrderRequest.EndDate && + ocd.IsEnabled == true) + .GroupBy((ocd, o) => ocd.OrderId).ToList(g => new OrderCostDetail + { + OrderId = g.Key, + SkuAmount = g.Sum(g.Value.Item1.SkuAmount), + FirstFreight = g.Sum(g.Value.Item1.FirstFreight), + StorageAmount = g.Sum(g.Value.Item1.StorageAmount), + PurchaseFreight = g.Sum(g.Value.Item1.PurchaseFreight), + ConsumableAmount = g.Sum(g.Value.Item1.ConsumableAmount), + InStorageAmount = g.Sum(g.Value.Item1.InStorageAmount), + OutStorageAmount = g.Sum(g.Value.Item1.OutStorageAmount) + }); + } + + var orderDropShippingList = fsql.Select().Where(ods => orderIdList.Contains(ods.OrderId) && ods.IsHistory == false).ToList(); foreach (var order in orderSourceList) From f8e9b32cd870cb0df313b83b07e2c6cd3c7d19e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E8=81=AA?= Date: Thu, 14 Sep 2023 14:59:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=8A=A9=E6=89=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=BF=9B=E5=BA=A6=E8=A7=84=E5=88=99=E6=94=B9?= =?UTF-8?q?=E4=B8=BAsku=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationAssistant/EvaluationAssistantBusiness.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index 0e100438..232eeaa5 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -963,7 +963,8 @@ namespace BBWY.Server.Business { foreach (var newOrderSku in newOrderSkuList) { - completedTaskCount += newOrderSku.ItemTotal ?? 1; + //completedTaskCount += newOrderSku.ItemTotal ?? 1; + completedTaskCount += 1; insertPromotionTaskSkuRecordList.Add(new PromotionTaskSkuRecord() { CreateTime = DateTime.Now, 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 3/6] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AB=AF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=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 @@ - - - + + + + + + + + + + + + + + Date: Thu, 14 Sep 2023 17:25:28 +0800 Subject: [PATCH 4/6] 10183 --- BBWY.Client/GlobalContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 98d217ab..6762ffda 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 = "10182"; + ClientVersion = "10183"; } private User user; From 71021b933ce11bd7652e42678d03473e6f47a68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E8=81=AA?= Date: Thu, 14 Sep 2023 17:32:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?token=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 83bb5268..17996ea3 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -56,7 +56,7 @@ namespace BBWY.Client userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE"; //齐越山鸡 - // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY"; //齐越陈默 From 5742bb771802bc3ead11c808dc33ca1b3543b346 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 15 Sep 2023 17:38:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=BE=85=E8=90=BD=E4=BB=93=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=B0=81=E7=AE=B1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/GlobalContext.cs | 2 +- BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml | 1 + BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml | 2 ++ BBWY.Client/Views/FallWare/WaitFallWareControl.xaml | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 6762ffda..d5876d53 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 = "10183"; + ClientVersion = "10184"; } private User user; diff --git a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml index 56c8d761..44480b66 100644 --- a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml +++ b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml @@ -104,6 +104,7 @@ Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" CommandParameter="{Binding SealBoxId}" Margin=" 5,0,7,0"/> + diff --git a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml index e02d2348..8679d86c 100644 --- a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml +++ b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml @@ -102,6 +102,8 @@ Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" CommandParameter="{Binding SealBoxId}" Margin=" 5,0,7,0"/> + + diff --git a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml index ecb4227e..8feb9a9c 100644 --- a/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml +++ b/BBWY.Client/Views/FallWare/WaitFallWareControl.xaml @@ -107,7 +107,8 @@ Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" CommandParameter="{Binding SealBoxId}" Margin=" 5,0,7,0"/> - + +