Commit 7194b72b by 泽锋 李

fix

parent 0cc3b764
......@@ -1543,7 +1543,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
date_str = this_time_end.ToString("yyyy-MM-dd")
}) ?? new dc_base_forecast_history() { };
modalData.quantity_final_advise_ocean = null;
if (dc_base_forecast_history_ocean_data.id > 0)
if (dc_base_forecast_history_ocean_data.turnover_sales > 0 )
{
modalData.quantity_final_advise_ocean =(int)Math.Round( (dc_base_forecast_history_ocean_data.turnover_sales + dc_base_forecast_history_ocean_data.quantity_safe_inventory));
}
......@@ -1573,7 +1573,7 @@ where t1.gmt_modified>=@btime and t1.gmt_modified<=@etime
date_str = this_time_end.ToString("yyyy-MM-dd")
})??new dc_base_forecast_history() { };
modalData.quantity_final_advise_air = null;
if (dc_base_forecast_history_air_data.id > 0)
if (dc_base_forecast_history_air_data.turnover_sales > 0)
{
modalData.quantity_final_advise_air = (dc_base_forecast_history_air_data.turnover_sales + dc_base_forecast_history_air_data.quantity_safe_inventory);
}
......
......@@ -29,9 +29,9 @@ namespace AutoTurnOver.DB
public int transfer_delivery { get; set; }
public int transfer_bale_delivery { get; set; }
public int abroad_inbound_delivery { get; set; }
public int turnover_sales { get; set; }
public int usable_stock { get; set; }
public int quantity_transfer { get; set; }
public int quantity_purchase { get; set; }
public decimal turnover_sales { get; set; }
public decimal usable_stock { get; set; }
public decimal quantity_transfer { get; set; }
public decimal quantity_purchase { get; set; }
}
}
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