Commit ca4b1ad5 by 泽锋 李

新增时间断货类型

parent 0c626365
......@@ -70,7 +70,9 @@ namespace AutoTurnOver.Models
实际缺货 =1,
预计缺货 = 2,
实际冗余 = 3,
预计冗余 = 4
预计冗余 = 4,
实际断货 = 5,
}
/// <summary>
......
......@@ -23,7 +23,22 @@ namespace AutoTurnOver.Services
{
var dic = (IDictionary<string, object>)o;
dic["occur_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.occur_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
dic["pay_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.pay_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
if(
item.date_type == (int)dc_report_cash_flow_log_data_type_enum.销售数量
//|| item.date_type==(int)dc_report_cash_flow_log_data_type_enum.利润
//|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.退款
//|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.平台费用
//|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.释放销售成本
//|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.释放头程费用
)
{
}
else
{
dic["pay_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.pay_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
}
}
datas.Add(o);
......
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