Commit a3ab1169 by 泽锋 李

利润数据导出,新增产品名称

parent c553664d
...@@ -2179,7 +2179,7 @@ left join dc_base_sku as t4 on dat.bailun_sku = t4.bailun_sku ...@@ -2179,7 +2179,7 @@ left join dc_base_sku as t4 on dat.bailun_sku = t4.bailun_sku
} }
else else
{ {
sql = @" select ta.*,t4.product_code,t4.weight from dc_report_profit_analysis as ta sql = @" select ta.*,t4.product_code,t4.weight,t4.sku_title_cn as 'product_name' 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_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 left join dc_base_sku as t4 on dat.bailun_sku = t4.bailun_sku
"; ";
......
...@@ -313,6 +313,7 @@ namespace AutoTurnOver.Models ...@@ -313,6 +313,7 @@ namespace AutoTurnOver.Models
public class dc_report_profit_analysis_dto: dc_report_profit_analysis { public class dc_report_profit_analysis_dto: dc_report_profit_analysis {
public string product_code { get; set; } public string product_code { get; set; }
public decimal? weight { get; set; } public decimal? weight { get; set; }
public string product_name { get; set; }
} }
} }
...@@ -732,7 +732,7 @@ namespace AutoTurnOver.Services ...@@ -732,7 +732,7 @@ namespace AutoTurnOver.Services
if (list == null || list.Count <= 0) break; if (list == null || list.Count <= 0) break;
DataTable table = new DataTable(); DataTable table = new DataTable();
string[] cols = new string[] { "sku","商品编码", "国家", "仓库类型", "仓库", "默认调拨方式", "180天日均", "90天日均", "30天日均","7天日均","加权日均销量","预测日均销量", "采购单价", "单位重量", "实际建议周转数", string[] cols = new string[] { "sku","产品名称","商品编码", "国家", "仓库类型", "仓库", "默认调拨方式", "180天日均", "90天日均", "30天日均","7天日均","加权日均销量","预测日均销量", "采购单价", "单位重量", "实际建议周转数",
"实际建议周转金额", "实际周转数", "实际周转运费", "实际运费单价", "海运周转数(推荐海运)", "海运周转金额", "海运周转运费", "空运周转数(推荐空运)", "空运周转金额", "实际建议周转金额", "实际周转数", "实际周转运费", "实际运费单价", "海运周转数(推荐海运)", "海运周转金额", "海运周转运费", "空运周转数(推荐空运)", "空运周转金额",
"空运周转运费","实际-海运运费差值", "实际-海运周转采购金额差值" ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数", "实际周转天数", "空运周转运费","实际-海运运费差值", "实际-海运周转采购金额差值" ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数", "实际周转天数",
"海运周转天数", "30天预测销量海运运费-实际周转运费金额", "30天预测销量空运运费-实际周转运费金额", "30天预测销量空运运费-海运周转运费金额" "海运周转天数", "30天预测销量海运运费-实际周转运费金额", "30天预测销量空运运费-实际周转运费金额", "30天预测销量空运运费-海运周转运费金额"
...@@ -749,9 +749,11 @@ namespace AutoTurnOver.Services ...@@ -749,9 +749,11 @@ namespace AutoTurnOver.Services
DataRow row = table.NewRow(); DataRow row = table.NewRow();
row["sku"] = itemData.bailun_sku; row["sku"] = itemData.bailun_sku;
row["产品名称"] = itemData.product_name;
row["商品编码"] = itemData.product_code; row["商品编码"] = itemData.product_code;
row["国家"] = itemData.country; row["国家"] = itemData.country;
row["仓库类型"] = itemData.warehouse_type; row["仓库类型"] = itemData.warehouse_type;
row["仓库"] = itemData.warehouse_name;
row["默认调拨方式"] = itemData.transport_type; row["默认调拨方式"] = itemData.transport_type;
row["实际周转天数"] = itemData.turnover_days; row["实际周转天数"] = itemData.turnover_days;
......
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