Commit 2b291c19 by 泽锋 李

fix

parent d0c89100
......@@ -2003,12 +2003,12 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
profit_data.freight_stock_amount_air = profit_data.quantity_final_air_difference_amount <= 0 ? 0 : ((profit_data.freight_price_air_difference_amount) / (profit_data.quantity_final_air_difference_amount));
profit_data.freight_stock_amount_ocean_30 = profit_data.turnover_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_ocean_30_difference) / profit_data.turnover_amount);
profit_data.freight_stock_amount_air_30 = profit_data.turnover_amount <= 0 ? 0 : (Math.Abs(profit_data.freight_price_air_30_difference) / profit_data.turnover_amount);
profit_data.forecast_daily_weighted_sales = profit_data.turnover_days <= 0 ? 0 : Math.Round(profit_data.turnover_sales / profit_data.turnover_days);
profit_data.forecast_daily_weighted_sales_ocean = profit_data.turnover_days_ocean <= 0 ? 0 : Math.Round(profit_data.turnover_sales_ocean / profit_data.turnover_days_ocean);
profit_data.forecast_daily_weighted_sales_air = profit_data.turnover_days_air <= 0 ? 0 : Math.Round(profit_data.turnover_sales_air / profit_data.turnover_days_air);
var formula_json = profit_data.ToJson();
dc_report_profit_analysis data = formula_json.ToObj<dc_report_profit_analysis>();
data.forecast_daily_weighted_sales = profit_data.turnover_days <= 0 ? 0 : Math.Round(profit_data.turnover_sales / profit_data.turnover_days);
data.forecast_daily_weighted_sales_ocean = profit_data.turnover_days_ocean <= 0 ? 0 : Math.Round(profit_data.turnover_sales_ocean / profit_data.turnover_days_ocean);
data.forecast_daily_weighted_sales_air = profit_data.turnover_days_air <= 0 ? 0 : Math.Round(profit_data.turnover_sales_air / profit_data.turnover_days_air);
data.bailun_sku = bailun_sku;
data.formula_json = formula_json;
data.warehouse_code = warehouse_code;
......
......@@ -224,6 +224,10 @@ namespace AutoTurnOver.Models.Report
public decimal abroad_inbound_delivery_ocean;
public decimal transfer_order_days_ocean;
public decimal turnover_sales;
public decimal forecast_daily_weighted_sales { get; set; }
public decimal forecast_daily_weighted_sales_ocean { get; set; }
public decimal forecast_daily_weighted_sales_air { get; set; }
/// <summary>
/// 调拨时长总销量
/// </summary>
......
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