Commit c5eec0f0 by 泽锋 李

供应链长度加上调拨下单天数

parent cb4c7457
......@@ -263,6 +263,7 @@ namespace AutoTurnOver.Models.ApiDto
public DateTime sail_time { get; set; }
public DateTime sign_time { get; set; }
public DateTime put_time { get; set; }
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;
......@@ -273,7 +274,11 @@ namespace AutoTurnOver.Models.ApiDto
} }
public decimal calculation_bale_days
{ get {
return (decimal)(shipping_time - create_date).TotalHours / 24;
return (decimal)(bale_time - create_date).TotalHours / 24;
} }
public decimal calculation_order_days
{ get {
return (decimal)(shipping_time - bale_time).TotalHours / 24;
} }
}
......
......@@ -79,6 +79,10 @@ namespace AutoTurnOver.Models
public decimal transfer_sail_days_empty { get; set; }
public decimal transfer_sail_days_ocean { get; set; }
public decimal transfer_sail_days { get; set; }
public decimal transfer_order_days_empty { get; set; }
public decimal transfer_order_days_ocean { get; set; }
public decimal transfer_order_days { get; set; }
}
public class dc_average_warehouse_dto : dc_average_warehouse
......
......@@ -34,6 +34,16 @@ namespace AutoTurnOver.Models
public int? pay_days { get; set; }
public decimal? sail_days { get; set; }
/// <summary>
/// 打包时间
/// </summary>
public DateTime? bale_time { get; set; }
/// <summary>
/// 调拨下单天数
/// </summary>
public int? transfer_order_days { get; set; }
}
public class dc_base_order_data_source_dto: dc_base_order_data_source
......
......@@ -22,7 +22,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
try
{
Console.WriteLine($"开始 init ,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
//PurchaseAverageTargetServices.CalculationTransfer(days:(360*3),has_transfer:true);
PurchaseAverageTargetServices.CalculationTransfer(days:(360*3),has_transfer:true);
Console.WriteLine($"结束 init,线程Id:{Thread.CurrentThread.ManagedThreadId}{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
catch (Exception ex)
......
......@@ -24,7 +24,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
try
{
//report.ResetTransExpectArrivaltime();
//PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", days: (360 * 3));
PurchaseAverageTargetServices.CalculationTransfer("LM-EO-007", 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" });
......
......@@ -475,6 +475,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
dataWarehouse.transfer_bale_delivery = lmsAvg.Select(s => s.FirstOrDefault().calculation_bale_days).Average(); ;
dataWarehouse.transfer_delivery = lmsAvg.Select(s => s.FirstOrDefault().calculation_sign_days).Average();
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();
}
// 清空记录,重新记录数据源
......@@ -503,6 +504,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
transport_type = itemLms.FirstOrDefault().transport_type,
put_time = itemLms.FirstOrDefault().put_time,
sign_time = itemLms.FirstOrDefault().sign_time,
bale_time = itemLms.FirstOrDefault().bale_time,
shipping_time = itemLms.FirstOrDefault().shipping_time,
sail_time = itemLms.FirstOrDefault().sail_time,
create_date = itemLms.FirstOrDefault().create_date,
......@@ -530,6 +532,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
dataWarehouse.transfer_bale_delivery_ocean = oceanlmsAvg.Select(s => s.FirstOrDefault().calculation_bale_days).Average(); ;
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();
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)
{
......@@ -551,6 +554,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
dataWarehouse.transfer_bale_delivery_empty = emptylmsAvg.Select(s => s.FirstOrDefault().calculation_bale_days).Average(); ;
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();
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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment