Commit bb813fa9 by 泽锋 李

fix

parent bc8f5176
...@@ -2164,40 +2164,10 @@ order by t1.gmt_modified asc ...@@ -2164,40 +2164,10 @@ order by t1.gmt_modified asc
{ {
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
var sql = ""; var sql = "";
if (m.isSum) if (false && m.isSum)
{ {
sql = @" sql = @"
select
AVG(ta.sales_avg_180) as 'sales_avg_180',
AVG(ta.sales_avg_90) as 'sales_avg_90',
AVG(ta.sales_avg_30) as 'sales_avg_30',
AVG(ta.sales_avg_7) as 'sales_avg_7',
sum(ta.quantity_final_advise) as 'quantity_final_advise',
sum(ta.quantity_final_advise_amount) as 'quantity_final_advise_amount',
sum(ta.turnover) as 'turnover',
sum(ta.freight_price) as 'freight_price',
sum(ta.freight_unit_price) as 'freight_unit_price',
sum(ta.quantity_final_advise_ocean) as 'quantity_final_advise_ocean',
sum(ta.quantity_final_advise_ocean_amount) as 'quantity_final_advise_ocean_amount',
sum(ta.freight_price_ocean) as 'freight_price_ocean',
sum(ta.quantity_final_advise_air) as 'quantity_final_advise_air',
sum(ta.quantity_final_advise_air_amount) as 'quantity_final_advise_air_amount',
sum(ta.freight_price_air) as 'freight_price_air',
sum(ta.freight_price_ocean_difference_amount) as 'freight_price_ocean_difference_amount',
sum(ta.quantity_final_ocean_difference_amount) as 'quantity_final_ocean_difference_amount',
sum(ta.freight_price_air_difference_amount) as 'freight_price_air_difference_amount',
sum(ta.quantity_final_air_difference_amount) as 'quantity_final_air_difference_amount',
sum(ta.freight_price_ocean_air_difference) as 'freight_price_ocean_air_difference',
sum(ta.quantity_final__ocean_air_difference_amount) as 'quantity_final__ocean_air_difference_amount',
sum(ta.quantity_safe_inventory) as 'quantity_safe_inventory',
sum(ta.freight_price_ocean_30_difference) as 'freight_price_ocean_30_difference',
sum(ta.freight_price_air_30_difference) as 'freight_price_air_30_difference',
sum(ta.freight_price_air_ocean_30_difference) as 'freight_price_air_ocean_30_difference',
sum(ta.ocean_purchase) as 'ocean_purchase',
sum(ta.ocean_purchase_amount) as 'ocean_purchase_amount'
from dc_report_profit_analysis as ta
left join dc_auto_turnover as dat on dat.warehouse_code = ta.warehouse_code and dat.bailun_sku = ta.bailun_sku
left join dc_base_sku as t4 on dat.bailun_sku = t4.bailun_sku
"; ";
} }
...@@ -2513,7 +2483,41 @@ left join dc_auto_turnover as dat on dat.warehouse_code = ta.warehouse_code and ...@@ -2513,7 +2483,41 @@ left join dc_auto_turnover as dat on dat.warehouse_code = ta.warehouse_code and
} }
sql += " limit " + offset + "," + limit; sql += " limit " + offset + "," + limit;
var obj = _connection.Query<dc_report_profit_analysis_dto>(sql, parameters, buffered: false, commandTimeout: 0).AsList(); var obj = _connection.Query<dc_report_profit_analysis_dto>(sql, parameters, buffered: false, commandTimeout: 0).AsList();
return obj; if (m.isSum)
{
return new List<dc_report_profit_analysis_dto>() {
new dc_report_profit_analysis_dto {
sales_avg_180 =obj.Sum(s=>s.sales_avg_180),
sales_avg_90 =obj.Sum(s=>s.sales_avg_90),
sales_avg_30 =obj.Sum(s=>s.sales_avg_30),
sales_avg_7 =obj.Sum(s=>s.sales_avg_7),
quantity_final_advise =obj.Sum(s=>s.quantity_final_advise),
turnover_amount =obj.Sum(s=>s.turnover_amount),
quantity_final_advise_amount =obj.Sum(s=>s.quantity_final_advise_amount),
turnover =obj.Sum(s=>s.turnover),
freight_price =obj.Sum(s=>s.freight_price),
quantity_final_advise_ocean =obj.Sum(s=>s.quantity_final_advise_ocean),
quantity_final_advise_ocean_amount =obj.Sum(s=>s.quantity_final_advise_ocean_amount),
freight_price_ocean =obj.Sum(s=>s.freight_price_ocean),
quantity_final_advise_air =obj.Sum(s=>s.quantity_final_advise_air),
quantity_final_advise_air_amount =obj.Sum(s=>s.quantity_final_advise_air_amount),
freight_price_air =obj.Sum(s=>s.freight_price_air),
freight_price_ocean_difference_amount =obj.Sum(s=>s.freight_price_ocean_difference_amount),
quantity_safe_inventory =obj.Sum(s=>s.quantity_safe_inventory),
ocean_purchase =obj.Sum(s=>s.ocean_purchase),
ocean_purchase_amount =obj.Sum(s=>s.ocean_purchase_amount),
quantity_final_ocean_difference_amount =obj.Sum(s=>s.quantity_final_ocean_difference_amount),
freight_price_ocean_30_difference =obj.Sum(s=>s.freight_price_ocean_30_difference),
freight_price_air_30_difference =obj.Sum(s=>s.freight_price_air_30_difference),
freight_price_air_ocean_30_difference =obj.Sum(s=>s.freight_price_air_ocean_30_difference),
}
};
}
else
{
return obj;
}
} }
......
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