Commit 7e46bb24 by 泽锋 李

利润计算新增计算过程

parent 8056813c
...@@ -12,6 +12,11 @@ namespace AutoTurnOver.Models.Report ...@@ -12,6 +12,11 @@ namespace AutoTurnOver.Models.Report
public int? quantity_final_advise; public int? quantity_final_advise;
/// <summary> /// <summary>
/// 30天的预计周转数
/// </summary>
public int? quantity_final_advise_30;
/// <summary>
/// 实际周转数 /// 实际周转数
/// </summary> /// </summary>
public int? turnover; public int? turnover;
...@@ -20,6 +25,10 @@ namespace AutoTurnOver.Models.Report ...@@ -20,6 +25,10 @@ namespace AutoTurnOver.Models.Report
/// 实际建议周转金额 /// 实际建议周转金额
/// </summary> /// </summary>
public decimal? quantity_final_advise_amount; public decimal? quantity_final_advise_amount;
/// <summary>
/// 30天的预计周转金额
/// </summary>
public decimal? quantity_final_advise_amount_30;
/// <summary> /// <summary>
/// 实际周转金额 /// 实际周转金额
...@@ -40,15 +49,25 @@ namespace AutoTurnOver.Models.Report ...@@ -40,15 +49,25 @@ namespace AutoTurnOver.Models.Report
/// 实际周转运费 /// 实际周转运费
/// </summary> /// </summary>
public decimal? freight_price; public decimal? freight_price;
/// <summary>
/// 30 天的实际周转运费
/// </summary>
public decimal? freight_price_30;
/// <summary> /// <summary>
/// 海运周转数(推荐海运) /// 海运周转数(推荐海运)
/// </summary> /// </summary>
public int? quantity_final_advise_ocean; public int? quantity_final_advise_ocean;
/// <summary> /// <summary>
/// 海运周转运费 /// 海运周转运费
/// </summary> /// </summary>
public decimal? freight_price_ocean; public decimal? freight_price_ocean;
/// <summary>
/// 30天海运周转运费
/// </summary>
public decimal? freight_price_ocean_30;
/// <summary> /// <summary>
/// 海运运费单价 /// 海运运费单价
...@@ -77,6 +96,10 @@ namespace AutoTurnOver.Models.Report ...@@ -77,6 +96,10 @@ namespace AutoTurnOver.Models.Report
/// 空运周转运费 /// 空运周转运费
/// </summary> /// </summary>
public decimal? freight_price_air; public decimal? freight_price_air;
/// <summary>
/// 30天空运周转运费
/// </summary>
public decimal? freight_price_air_30;
/// <summary> /// <summary>
/// 实际-空运运费差值 /// 实际-空运运费差值
......
...@@ -14,6 +14,11 @@ namespace AutoTurnOver.Models ...@@ -14,6 +14,11 @@ namespace AutoTurnOver.Models
public class day_dto public class day_dto
{ {
public bool has_int { get; set; } public bool has_int { get; set; }
/// <summary>
/// 计算公式
/// </summary>
public string formula { get; set; }
public DateTime date { get; set; } public DateTime date { get; set; }
public string date_str { get { public string date_str { get {
return date.ToString("MM-dd"+$"({Sinicization(date.DayOfWeek)})"); return date.ToString("MM-dd"+$"({Sinicization(date.DayOfWeek)})");
......
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