fix

AutoTurnOver.Models/ApiDto/api_lms_order_transfer_sku_dto.cs

@@ -258,7 +258,9 @@ namespace AutoTurnOver.Models.ApiDto
         public string transport_type { get; set; }
         public decimal sign_days { get; set; }
         public decimal put_days { get; set; }
+        public decimal sail_days { get; set; }
         public DateTime shipping_time { get; set; }
+        public DateTime sail_time { get; set; }
         public DateTime sign_time { get; set; }
         public DateTime put_time { get; set; }
         public DateTime create_date { get; set; }

AutoTurnOver.Models/dc_average_warehouse.cs

@@ -74,6 +74,9 @@ namespace AutoTurnOver.Models
         public decimal transfer_bale_delivery_empty { get; set; }
         public decimal abroad_inbound_delivery_empty { get; set; }
         public decimal transfer_delivery_empty { get; set; }
+        public decimal transfer_sail_days_empty { get; set; }
+        public decimal transfer_sail_days_ocean { get; set; }
+        public decimal transfer_sail_days { get; set; }
     }
 
     public class dc_average_warehouse_dto : dc_average_warehouse

AutoTurnOver.Models/dc_base_order_data_source.cs

@@ -23,6 +23,7 @@ namespace AutoTurnOver.Models
         public string pay_type { get; set; }
         public DateTime? confirm_time { get; set; }
         public DateTime? sign_time { get; set; }
+        public DateTime? sail_time { get; set; }
         public DateTime? put_time { get; set; }
         public DateTime? shipping_time { get; set; }
         public DateTime? create_date { get; set; }
@@ -31,8 +32,8 @@ namespace AutoTurnOver.Models
         /// 付款天数
         /// </summary>
         public int? pay_days { get; set; }
+        public decimal? sail_days { get; set; }
 
-     
     }
 
     public class dc_base_order_data_source_dto: dc_base_order_data_source
@@ -55,7 +56,7 @@ namespace AutoTurnOver.Models
                 }
                 else
                 {
-                    return $" 创建时间【{create_date}】 ~  交运【{shipping_time}】~ 签收【{sign_time}】 ~ 入库 【{put_time}】  ";
+                    return $" 创建时间【{create_date}】 ~  交运【{shipping_time}】~ 启航【{sail_time}】 ~ 签收【{sign_time}】 ~ 入库 【{put_time}】  ";
                 }
             }
         }

AutoTurnOver.Purchase.AverageTarget/AverageTargetBackgrounService.cs

@@ -37,7 +37,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
                 try
                 {
                     Console.WriteLine($"开始  init2 ，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                    PurchaseAverageTargetServices.Calculation(days:(360*3));
+                    //PurchaseAverageTargetServices.Calculation(days:(360*3));
                     Console.WriteLine($"结束 init2，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
                 }
                 catch (Exception ex)

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -497,11 +497,13 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                                     order_no = itemLms.Key.order_no,
                                     order_type = "调拨单-平均天数计算",
                                     put_days = itemLms.FirstOrDefault().put_days,
+                                    sail_days = itemLms.FirstOrDefault().sail_days,
                                     sign_days = itemLms.FirstOrDefault().sign_days,
                                     transport_type = itemLms.FirstOrDefault().transport_type,
                                     put_time = itemLms.FirstOrDefault().put_time,
                                     sign_time = itemLms.FirstOrDefault().sign_time,
                                     shipping_time = itemLms.FirstOrDefault().shipping_time,
+                                    sail_time = itemLms.FirstOrDefault().sail_time,
                                     create_date = itemLms.FirstOrDefault().create_date,
                                 });
                             }
@@ -528,6 +530,10 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             dataWarehouse.transfer_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_sign_days).Average();
                             dataWarehouse.abroad_inbound_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
                         }
+                        if(oceanlmsAvg != null && oceanlmsAvg.Where(s=>s.Any(v=>v.sail_days>0)).Count() >= 1)
+                        {
+                            dataWarehouse.transfer_sail_days_ocean = oceanlmsAvg.Where(s => s.Any(v => v.sail_days > 0)).Select(s => s.FirstOrDefault().sail_days).Average();
+                        }
                         #endregion
 
                         #region 空运计算
@@ -545,6 +551,10 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             dataWarehouse.transfer_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_sign_days).Average();
                             dataWarehouse.abroad_inbound_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
                         }
+                        if (emptylmsAvg != null && emptylmsAvg.Where(s => s.Any(v => v.sail_days > 0)).Count() >= 1)
+                        {
+                            dataWarehouse.transfer_sail_days_empty = emptylmsAvg.Where(s => s.Any(v => v.sail_days > 0)).Select(s => s.FirstOrDefault().sail_days).Average();
+                        }
                         #endregion
 
                         var lmsTransportCountDatas = ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto