fix

AutoTurnOver.Models/ApiDto/api_lms_order_transfer_sku_dto.cs

@@ -245,7 +245,7 @@ namespace AutoTurnOver.Models.ApiDto
     {
         public string logistics_code { get; set; }
         public decimal avg_sign_days { get; set; }
-        public decimal avg_put_days { get; set; }
+        public decimal? avg_put_days { get; set; }
         public string logistics_name { get; set; }
         public string transport_type { get; set; }
     }

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -142,9 +142,9 @@ namespace AutoTurnOver.Services
             conn.Update(task_log);
         }
 
-        public static void CalculationTransfer(string bailun_sku  ="")
+        public static void CalculationTransfer(string bailun_sku = "")
         {
-      
+
             MyMySqlConnection conn = connectionHelper._connection;
 
             var task_log = new dc_task_log
@@ -164,11 +164,11 @@ namespace AutoTurnOver.Services
                 var chageSkuList = AveragePurchase.GetTransferChangeSku(30, bailun_sku);
                 foreach (var skuItem in chageSkuList)
                 {
-                    if (skuItem.warehouse_code== "MMDUSFBA")
+                    if (skuItem.warehouse_code == "MMDUSFBA")
                     {
 
                     }
-                        var base_wa = conn.QueryFirstOrDefault<string>(" select t2.`code` from dc_base_warehouse as t1 left join dc_base_country as t2 on t1.area_name = t2.`name` where warehouse_code=@warehouse_code ",new { skuItem.warehouse_code});
+                    var base_wa = conn.QueryFirstOrDefault<string>(" select t2.`code` from dc_base_warehouse as t1 left join dc_base_country as t2 on t1.area_name = t2.`name` where warehouse_code=@warehouse_code ", new { skuItem.warehouse_code });
 
                     var purchaseWList = AveragePurchase.GetPurchaseListByWode(skuItem, _seed_count).ToList();
 
@@ -256,27 +256,42 @@ namespace AutoTurnOver.Services
                     //    transfer_type = transfer_type
                     //});
 
-                    var lmsAvg = ApiUtility.GetLmsOrderTransferAvg(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto { 
-                    //bailun_sku = skuItem.bailun_sku,
-                    transfer_type = transfer_type,
-                    warehouse_code = skuItem.warehouse_code,
-                    logistics_code = dc_base_head_transport_config_data.logistics_code,
-                    country = base_wa
+                    var lmsAvg = ApiUtility.GetLmsOrderTransferAvg(new Models.ApiDto.api_lms_order_transfer_sku_requst_dto
+                    {
+                        //bailun_sku = skuItem.bailun_sku,
+                        transfer_type = transfer_type,
+                        warehouse_code = skuItem.warehouse_code,
+                        logistics_code = dc_base_head_transport_config_data.logistics_code,
+                        country = base_wa
                     });
 
                     if (lmsAvg != null && lmsAvg.Count >= 3)
                     {
                         dataWarehouse.transfer_bale_delivery = 1;
-                        dataWarehouse.transfer_delivery =( (lmsAvg.Sum(s => s.avg_sign_days)- lmsAvg.Max(s=>s.avg_sign_days)-lmsAvg.Min(s=>s.avg_sign_days))/ (lmsAvg.Count-2));
-                        dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Sum(s => s.avg_put_days) - lmsAvg.Max(s => s.avg_put_days) - lmsAvg.Min(s => s.avg_put_days)) / (lmsAvg.Count - 2)); 
+                        dataWarehouse.transfer_delivery = ((lmsAvg.Sum(s => s.avg_sign_days) - lmsAvg.Max(s => s.avg_sign_days) - lmsAvg.Min(s => s.avg_sign_days)) / (lmsAvg.Count - 2));
                     }
-                    else  if (lmsAvg != null && lmsAvg.Count>=1)
+                    else if (lmsAvg != null && lmsAvg.Count >= 1)
                     {
                         dataWarehouse.transfer_bale_delivery = 1;
-                        dataWarehouse.transfer_delivery = lmsAvg.Select(s=>s.avg_sign_days).Average();
-                        dataWarehouse.abroad_inbound_delivery = lmsAvg.Select(s => s.avg_put_days).Average();
+                        dataWarehouse.transfer_delivery = lmsAvg.Select(s => s.avg_sign_days).Average();
+                    }
+
+                    if (lmsAvg.Where(s => s.avg_put_days != null).Count() >= 3)
+                    {
+                        dataWarehouse.abroad_inbound_delivery = ((lmsAvg.Where(s => s.avg_put_days > 0).Sum(s => s.avg_put_days.Value) - lmsAvg.Max(s => s.avg_put_days.Value) - lmsAvg.Min(s => s.avg_put_days.Value)) / (lmsAvg.Count - 2));
+                    }
+                    else if (lmsAvg.Where(s => s.avg_put_days != null).Count() >= 1)
+                    {
+
+                        dataWarehouse.abroad_inbound_delivery = lmsAvg.Where(s => s.avg_put_days != null).Select(s => s.avg_put_days.Value).Average();
+                    }
+                    else
+                    {
+                        dataWarehouse.abroad_inbound_delivery = 0;
                     }
 
+                   
+
                     // 大于两条记录，才计算平均值，否则没有意义
                     //if (transport3List != null && transport3List.Count() >= 2)
                     //{