fix

AutoTurnOver.Models/ApiDto/api_lms_order_transfer_sku_dto.cs

@@ -256,9 +256,9 @@ namespace AutoTurnOver.Models.ApiDto
         public string logistics_code { get; set; }
         public string logistics_name { get; set; }
         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 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; }
@@ -266,7 +266,7 @@ namespace AutoTurnOver.Models.ApiDto
         public DateTime bale_time { get; set; }
         public DateTime create_date { get; set; }
         public decimal calculation_sign_days { get {
-                return (decimal)(sign_time - shipping_time).TotalHours / 24;
+                return (decimal)(sign_time - sail_time).TotalHours / 24;
             } }
         public decimal calculation_put_days
         { get {
@@ -280,6 +280,10 @@ namespace AutoTurnOver.Models.ApiDto
         { get {
                 return (decimal)(shipping_time - bale_time).TotalHours / 24;
             } }
+        public decimal calculation_sail_days
+        { get {
+                return (decimal)(sail_time - shipping_time).TotalHours / 24;
+            } }
     }
 
     public class api_lms_order_transfer_sku_requst_dto

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -24,7 +24,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
             try
             {
                 //report.ResetTransExpectArrivaltime();
-                //PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", days: (360 * 3));
+                //PurchaseAverageTargetServices.CalculationTransfer("217632401", days: (360 * 3));
                 //PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3));
                 //ApiUtility.GetLmsTransportCountList(new Models.ApiDto.api_transport_count_order_transfer_query_dto { bailun_sku= "LM-EO-007", targetwareno= "MMDUSFBA" });
 

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -477,6 +477,11 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             dataWarehouse.abroad_inbound_delivery = lmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
                             dataWarehouse.transfer_order_days = lmsAvg.Select(s => s.FirstOrDefault().calculation_order_days).Average();
                         }
+                        if (lmsAvg != null && lmsAvg.Where(s => s.Any(v => v.calculation_sail_days > 0)).Count() >= 1)
+                        {
+                            var sail_order_datas = lmsAvg.Where(s => s.Any(v => v.calculation_sail_days > 0)).ToList();
+                            dataWarehouse.transfer_sail_days_ocean = sail_order_datas.Select(s => s.FirstOrDefault().calculation_sail_days).Average();
+                        }
 
                         // 清空记录，重新记录数据源
                         conn.Execute(" delete from dc_base_order_data_source where bailun_sku_warehouse_code=@bailun_sku_warehouse_code and order_type=@order_type ", new
@@ -498,9 +503,9 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                                     logistics_name = itemLms.FirstOrDefault().logistics_name,
                                     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,
+                                    put_days = itemLms.FirstOrDefault().calculation_put_days,
+                                    sail_days = itemLms.FirstOrDefault().calculation_sail_days,
+                                    sign_days = itemLms.FirstOrDefault().calculation_sign_days,
                                     transport_type = itemLms.FirstOrDefault().transport_type,
                                     put_time = itemLms.FirstOrDefault().put_time,
                                     sign_time = itemLms.FirstOrDefault().sign_time,
@@ -534,9 +539,11 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             dataWarehouse.abroad_inbound_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
                             dataWarehouse.transfer_order_days_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_order_days).Average();
                         }
-                        if(oceanlmsAvg != null && oceanlmsAvg.Where(s=>s.Any(v=>v.sail_days>0)).Count() >= 1)
+                        if(oceanlmsAvg != null && oceanlmsAvg.Where(s=>s.Any(v=>v.calculation_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();
+
+                            var sail_order_datas = oceanlmsAvg.Where(s => s.Any(v => v.calculation_sail_days > 0)).ToList();
+                            dataWarehouse.transfer_sail_days_ocean = sail_order_datas.Select(s => s.FirstOrDefault().calculation_sail_days).Average();
                         }
                         #endregion
 
@@ -556,9 +563,10 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             dataWarehouse.abroad_inbound_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_put_days).Average();
                             dataWarehouse.transfer_order_days_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_order_days).Average();
                         }
-                        if (emptylmsAvg != null && emptylmsAvg.Where(s => s.Any(v => v.sail_days > 0)).Count() >= 1)
+                        if (emptylmsAvg != null && emptylmsAvg.Where(s => s.Any(v => v.calculation_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();
+                            var sail_order_datas = emptylmsAvg.Where(s => s.Any(v => v.calculation_sail_days > 0)).ToList();
+                            dataWarehouse.transfer_sail_days_empty = sail_order_datas.Select(s => s.FirstOrDefault().calculation_sail_days).Average();
                         }
                         #endregion