Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

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\"") &&

BBWY.Client/App.xaml.cs

@@ -56,11 +56,13 @@ namespace BBWY.Client
             userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE";
 
             //齐越山鸡
-           // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
 
+            //飞鱼
+            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/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10182";
+            ClientVersion = "10184";
         }
 
         private User user;

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)
@@ -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 事件绑定
 
-
+        /// <summary>
+        /// 修改任务状态
+        /// </summary>
+        public ICommand UpdateTaskStateCommand { get; set; }
 
         public ICommand LoadSealBoxSkuDataCommand { get; set; }
 

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"/>
+                                <TextBlock VerticalAlignment="Center" Text="{Binding BoxCount,StringFormat=封箱数量: {0}}" Margin="16,0,0,0" />
                             </StackPanel>
                             <Grid Grid.Column="1">
                                 <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>

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"/>
+
+                                <TextBlock VerticalAlignment="Center" Text="{Binding BoxCount,StringFormat=封箱数量: {0}}" Margin="16,0,0,0" />
                             </StackPanel>
 
                             <Grid Grid.Column="1">

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"/>
-                               
+
+                                <TextBlock VerticalAlignment="Center" Text="{Binding SealBoxCount,StringFormat=封箱数量: {0}}" Margin="16,0,0,0" />
 
                                 <TextBlock VerticalAlignment="Center" Text="部门:" Margin="16,0,0,0" />
                                 <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"

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" 
-                                  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.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" 

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,

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<OrderSku>().Where(osku => osku.Price != 0 && orderIdList.Contains(osku.OrderId)).ToList();
-            var orderCostDetailGroup = fsql.Select<OrderCostDetail>().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<OrderSku> orderSkuList = null;
+            if (orderIdList.Count() < 2000)
+            {
+                orderSkuList = fsql.Select<OrderSku>().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<OrderSku, Order>().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<OrderCostDetail> orderCostDetailGroup = null;
+            if (orderIdList.Count() < 2000)
+            {
+                orderCostDetailGroup = fsql.Select<OrderCostDetail>().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<OrderCostDetail, Order>().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<OrderDropShipping>().Where(ods => orderIdList.Contains(ods.OrderId) && ods.IsHistory == false).ToList();
 
             foreach (var order in orderSourceList)