利润优化新增品牌导出

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -2238,7 +2238,7 @@ order by t1.gmt_modified asc
             }
             else
             {
-                sql = @" select ta.*,t4.product_code,t4.weight,t4.sku_title_cn as 'product_name',t5.`stock` as 'fba_storage_capacity',
+                sql = @" select ta.*,t4.product_code,t4.weight,t4.sku_title_cn as 'product_name',t4.brand as 'brand',t5.`stock` as 'fba_storage_capacity',
 t5.`stock` - (ifnull(t6.quantity_transfer_temp_schedule,0) + ifnull(t6.quantity_transfer_temporary_storage,0) + ifnull(t6.quantity_transfer_plan,0) + ifnull(t6.quantity_purchase,0) ) as 'storage_capacity'
 
 from dc_report_profit_analysis as ta 

AutoTurnOver.Models/dc_report_profit_analysis.cs

@@ -342,6 +342,7 @@ namespace AutoTurnOver.Models
 
     public  class dc_report_profit_analysis_dto: dc_report_profit_analysis {
         public string product_code { get; set; }
+        public string brand { get; set; }
         public decimal? weight { get; set; }
         public string product_name { get; set; }
         public decimal? storage_capacity { get; set; }

AutoTurnOver.Services/PurchaseAdviseServices.cs

@@ -2,6 +2,7 @@
 using AutoTurnOver.Models;
 using AutoTurnOver.Models.ApiDto;
 using AutoTurnOver.Models.auto;
+using AutoTurnOver.Utility;
 using Bailun.ServiceFabric;
 using Dapper;
 using System;
@@ -123,7 +124,7 @@ namespace AutoTurnOver.Services
 
         public string Export(dc_auto_purchase_advise_detailed_search_dto searchData, out int orows)
         {
-            var fileName = AppContext.BaseDirectory + $@"采购建议-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
+            var fileName = AppContext.BaseDirectory + $@"采购建议-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.xlsx";
             var total = 0;
             var list = PurchaseAdviseServices.DetailList(searchData, 0, int.MaxValue, ref total);
             orows = list.Count;
@@ -134,7 +135,7 @@ namespace AutoTurnOver.Services
                  "采购单价" ,"历史7天日均","历史14日均","历史30日均","加权日均","安全库存","今日实际缺货","供应链累积销量","供应链到货当天的销量"
                  ,"预测销量","累积入库数量","实际库存","moq","多备天数","多备数量","预测销量配置","实际推送下单数量","总下单金额","转仓来源仓库编码","转仓来源仓库名称","仓库类型","最新计算时间"
                  ,"首单日期","首单单号"
-                 ,"母sku"  ,"母sku原始建议数" ,"库容缺少值" ,"可用库容"
+                 ,"母sku"  ,"母sku原始建议数" ,"库容缺少值" ,"可用库容","切换物流备注"
             };
             foreach (var item in cols)
             {
@@ -144,6 +145,7 @@ namespace AutoTurnOver.Services
             foreach (var itemData in list)
             {
                 DataRow row = table.NewRow();
+                row["切换物流备注"] = itemData.replace_logistics_remarks;
                 row["首单日期"] = itemData.mother_sku;
                 row["母sku原始建议数"] = itemData.mother_sku_quantity;
                 row["库容缺少值"] = itemData.storage_capacity_lack_quantity;
@@ -218,7 +220,7 @@ namespace AutoTurnOver.Services
 
 
 
-            CsvFileHelper.SaveCSV(table, fileName);
+            EPPlusHelper.ExportExcel(table, fileName);
 
             return fileName;
 
@@ -714,7 +716,7 @@ namespace AutoTurnOver.Services
                     table.Rows.Add(row);
                 }
 
-                CsvFileHelper.SaveCSV(table, fileName);
+                Utility.CsvFileHelper.SaveCSV(table, fileName);
 
 
                 return fileName;

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -730,7 +730,7 @@ namespace AutoTurnOver.Services
             try
             {
 
-                var fileName = AppContext.BaseDirectory + $@"周转利润分析-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
+                var fileName = AppContext.BaseDirectory + $@"周转利润分析-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.xlsx";
                 int page = 1;
                 int rows = 100000;
 
@@ -748,13 +748,13 @@ namespace AutoTurnOver.Services
                 orows += list.Count();
 
                 DataTable table = new DataTable();
-                string[] cols = new string[] { "sku","产品名称","商品编码", "国家", "仓库类型", "仓库", "默认调拨方式", "180天日均",  "90天日均", "30天日均","7天日均","加权日均销量","预测日均销量", "采购单价"
+                string[] cols = new string[] { "sku","产品名称","商品编码","品牌", "国家", "仓库类型", "仓库", "默认调拨方式", "180天日均",  "90天日均", "30天日均","7天日均","加权日均销量","预测日均销量", "采购单价"
                  ,"Fba库容值" ,"可用库容值","空运票数占比","空运数量占比"  , "单位重量", "实际建议周转数",
                         "实际建议周转金额",  "实际周转数",  "实际周转运费",   "实际运费单价",  "海运周转数（推荐海运）", "海运周转金额", "海运周转运费", "空运周转数（推荐空运）", "空运周转金额",
                         "空运周转运费","实际-海运运费差值", "实际-海运周转采购金额差值"  ,"实际-空运运费差值", "实际-空运周转采购金额差值", "海运-空运运费差值", "海运-空运周转采购金额差值", "安全库存数量", "空运周转天数", "实际周转天数",
                         "海运周转天数", "30天预测销量海运运费-实际周转运费金额", "30天预测销量空运运费-实际周转运费金额", "30天预测销量空运运费-海运周转运费金额"
                         , "差值(实际-海运)/实际周转采购金额占比"   , "差值(海运-空运)/实际周转采购金额占比" , "差值(空运-实际)/实际周转采购金额占比"
-                        , "海运与实际运费差额/库存差额"   , "空运与实际运费差额/库存差额"  , "30天销量海运与实际运费差额/库存金额"  , "30天销量空运与实际运费差额/库存金额" , "补海运周转数","补海运周转金额","切换物流备注"
+                        , "海运与实际运费差额/库存差额"   , "空运与实际运费差额/库存差额"  , "30天销量海运与实际运费差额/库存金额"  , "30天销量空运与实际运费差额/库存金额" , "补海运周转数","补海运周转金额"
 };
                 foreach (var item in cols)
                 {
@@ -765,7 +765,7 @@ namespace AutoTurnOver.Services
                 {
                     DataRow row = table.NewRow();
 
-                    row["切换物流备注"] = itemData.replace_logistics_remarks;
+                 
                     row["Fba库容值"] = itemData.fba_storage_capacity;
                     row["可用库容值"] = itemData.storage_capacity;
                     row["空运票数占比"] = itemData.order_count_3_radio;
@@ -774,6 +774,7 @@ namespace AutoTurnOver.Services
                     row["sku"] = itemData.bailun_sku;
                     row["产品名称"] = itemData.product_name;
                     row["商品编码"] = itemData.product_code;
+                    row["品牌"] = itemData.brand;
                     row["国家"] = itemData.country;
                     row["仓库类型"] = itemData.warehouse_type;
                     row["仓库"] = itemData.warehouse_name;