导出新增总行数记录

AutoTurnOver.Models/dc_task_download.cs

@@ -21,6 +21,7 @@ namespace AutoTurnOver.Models
         public string result_file_url { get; set; }
         public string error_message { get; set; }
         public string error_stack_trace { get; set; }
+        public int rows { get; set; }
     }
 
     public class dc_task_download_dto : dc_task_download

AutoTurnOver.Services/DailyServices.cs

@@ -113,21 +113,21 @@ namespace AutoTurnOver.Services
             return DB.daily.TaskDownloadList(user_name, task_name, offset, limit,ref total, start_date, end_date);
         }
 
-        public string ExportShortagePush(export_sortage_push_search_dto searchData)
+        public string ExportShortagePush(export_sortage_push_search_dto searchData, out int orows)
         {
             try
             {
                 var fileName = AppContext.BaseDirectory + $@"改在线数据-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
                 int page = 1;
                 int rows = 50000;
-
+                orows = 0;
                 while (true)
                 {
                     int total = 0;
                     var list = ShortagePushList(searchData.platform, searchData.bailun_sku, (page-1)* rows, rows, ref total, searchData.start_date, searchData.end_date, searchData.warehousecode, searchData.warehousetype, searchData.warehousearea);
 
                     if (list == null || list.Count <= 0) break;
-
+                    orows += list.Count();
                     DataTable table = new DataTable();
                     string[] cols = new string[] { "仓库编码","仓库名称", "sku", "平台","改0 推送时间", "补货推送时间"      };
                     foreach (var item in cols)
@@ -252,7 +252,7 @@ namespace AutoTurnOver.Services
 
 
         private static int export_count = 0;
-        public string Export(dc_base_stock_search_dto search_data)
+        public string Export(dc_base_stock_search_dto search_data, out int orows)
         {
             try
             {
@@ -261,6 +261,7 @@ namespace AutoTurnOver.Services
                 var fileName = AppContext.BaseDirectory + $@"实时库存-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
                 int page = 1;
                 int rows = 50000;
+                orows = 0;
                 if (export_count == 1)
                 {
                     rows = 250000;
@@ -274,7 +275,7 @@ namespace AutoTurnOver.Services
                     var list = services.RealtimeList(search_data,ref total);
 
                     if (list == null || list.Count <= 0) break;
-
+                    orows += list.Count();
                     DataTable table = new DataTable();
                     string[] cols = new string[] { "百伦简易分类","Sku", "采购名称", "中文名","内部编码", "仓库编码", "仓库名称", "货主编码","实时采购在途",
                        "实时调拨在途(总)","实时调拨在途(调拨单)","实时调拨在途(采购临时)","实时调拨在途(暂存)"
@@ -427,7 +428,7 @@ namespace AutoTurnOver.Services
            
         }
         
-        public string FbaExport(dc_base_stock_search_dto search_data)
+        public string FbaExport(dc_base_stock_search_dto search_data, out int orows)
         {
             try
             {
@@ -436,6 +437,7 @@ namespace AutoTurnOver.Services
                 var fileName = AppContext.BaseDirectory + $@"Fba实时库存-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
                 int page = 1;
                 int rows = 50000;
+                orows = 0;
                 if (export_count == 1)
                 {
                     rows = 250000;
@@ -449,7 +451,7 @@ namespace AutoTurnOver.Services
                     var list = services.RealtimeFbaList(search_data,ref total);
 
                     if (list == null || list.Count <= 0) break;
-
+                    orows += list.Count();
                     DataTable table = new DataTable();
                     string[] cols = new string[] { "账号","站点","asin","仓库sku","产品类型","分组名称","销售名称","产品名称"
                         ,"昨日review分数","昨日reivew个数","仓库编码","仓库名称","国家"

AutoTurnOver.Services/ReportServices.cs

@@ -858,17 +858,18 @@ namespace AutoTurnOver.Services
 
         }
 
-        public string GetGoodsExport(bailun_sku_goods_search_dto search_data)
+        public string GetGoodsExport(bailun_sku_goods_search_dto search_data, out int orows)
         {
 
 
             try
             {
+                orows = 0;
                 var fileName = AppContext.BaseDirectory + $@"商品销售情况汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
 
                 var total = 0;
                 var list = GetGoods(search_data, 0, int.MaxValue, ref total);
-
+                orows += list.Count();
                 // 查询站点，组织列头
                 var web_sites = ApiServices.PlatformtypeWebsiteList(search_data.platform_type);
 
@@ -1069,7 +1070,7 @@ namespace AutoTurnOver.Services
             return report.GetReportPlatformGoodsPage(m, offset, limit, ref total, order, sort);
         }
 
-        public string ReportGoodsExport(dc_report_goods_search_dto m, string order, string sort)
+        public string ReportGoodsExport(dc_report_goods_search_dto m, string order, string sort, out int orows)
         {
             var fileName = AppContext.BaseDirectory + $@"商品销量报表（仓库维度）-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
 
@@ -1077,10 +1078,12 @@ namespace AutoTurnOver.Services
 
             int page = 1;
             int rows = 250000;
+            orows = 0;
             while (true)
             {
                 var list = GetReportGoodsPage(m, (page - 1) * rows, rows, ref total, order, sort);
                 if (list == null || list.Count <= 0) break;
+                orows += list.Count();
                 DataTable table = new DataTable();
                 string[] cols = new string[] { "商品编码","产品类型", "仓库类型", "仓库名称", "可用库存数", "在途","单价", "重量","采购","中文名称","昨日销量","昨日销售额","近7天销量","近7天销售额","近30天销量","近30天销售额",
             };
@@ -1128,7 +1131,7 @@ namespace AutoTurnOver.Services
             return fileName;
         } 
         
-        public string ReportPlatformGoodsExport(dc_report_goods_platform_search_dto m, string order, string sort)
+        public string ReportPlatformGoodsExport(dc_report_goods_platform_search_dto m, string order, string sort, out int orows)
         {
             var fileName = AppContext.BaseDirectory + $@"商品销量报表（平台维度）-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
 
@@ -1136,10 +1139,12 @@ namespace AutoTurnOver.Services
 
             int page = 1;
             int rows = 250000;
+            orows = 0;
             while (true)
             {
                 var list = GetReportPlatformGoodsPage(m, (page - 1) * rows, rows, ref total, order, sort);
                 if (list == null || list.Count <= 0) break;
+                orows += list.Count();
                 DataTable table = new DataTable();
                 string[] cols = new string[] { "商品编码","产品类型", "平台","单价", "重量","采购","中文名称","昨日销量","昨日销售额","近7天销量","近7天销售额","近30天销量","近30天销售额",
             };

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -288,7 +288,7 @@ namespace AutoTurnOver.Services
             return DB.dc_auto_turnover.SkuNewSupplierDeliveryList();
         }
 
-        public string Export(Condition_AutoTurnOver m, string order, string sort)
+        public string Export(Condition_AutoTurnOver m, string order, string sort, out int orows)
         {
             var fileName = AppContext.BaseDirectory + $@"周转表-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
 
@@ -300,10 +300,13 @@ namespace AutoTurnOver.Services
 
             int page = 1;
             int rows = 250000;
+            orows = 0;
             while (true)
             {
                 var list = service.List(m, (page - 1) * rows, rows, ref total, order, sort);
                 if (list == null || list.Count <= 0) break;
+
+                orows += list.Count();
                 DataTable table = new DataTable();
                 string[] cols = new string[] { "Sku","商品编码", "内部编码", "sku标题", "仓库编码", "仓库名称","仓库所在国家", "MOQ",
                 "采购在途",
@@ -443,8 +446,9 @@ namespace AutoTurnOver.Services
         /// <param name="order"></param>
         /// <param name="sort"></param>
         /// <returns></returns>
-        public string ExportSalesTemplate(Condition_AutoTurnOver m, string order, string sort)
+        public string ExportSalesTemplate(Condition_AutoTurnOver m, string order, string sort, out int orows)
         {
+            orows = 0;
             var service = new Services.SkuAutoTurnServices();
             int total = 0;
             var list = service.List(m, 0, int.MaxValue, ref total, "", "");
@@ -481,7 +485,7 @@ namespace AutoTurnOver.Services
                 row["14日日均"] = item.history_fourteenday_sales;
                 row["30日日均"] = item.history_thirtyday_sales;
 
-
+                orows++;
                 table.Rows.Add(row);
             }
             CsvFileHelper.SaveCSV(table, fileName);
@@ -713,7 +717,7 @@ namespace AutoTurnOver.Services
         }
 
 
-        public string ProfitAnalysisExport(Condition_AutoTurnOver m)
+        public string ProfitAnalysisExport(Condition_AutoTurnOver m, out int orows)
         {
             try
             {
@@ -721,14 +725,14 @@ namespace AutoTurnOver.Services
                 var fileName = AppContext.BaseDirectory + $@"周转利润分析-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
                 int page = 1;
                 int rows = 100000;
-
+                orows = 0;
                 while (true)
                 {
                     int total = 0;
                     var offset = (page - 1) * rows;
                     var limit = rows;
                     var list = ProfitAnalysis(m, offset, limit, ref total, "", "");
-
+                    orows += list.Count();
                     if (list == null || list.Count <= 0) break;
 
                     DataTable table = new DataTable();

AutoTurnOver.Services/TaskDownloadServices.cs

@@ -107,7 +107,9 @@ namespace AutoTurnOver.Services
 
             bailun_sku_goods_search_dto search_data = par_json.ToObject<bailun_sku_goods_search_dto>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new ReportServices().GetGoodsExport(search_data);
+            var rows = 0;
+            var memory = new ReportServices().GetGoodsExport(search_data,out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -122,7 +124,9 @@ namespace AutoTurnOver.Services
 
             dc_report_goods_search_dto search_data = par_json.ToObject<dc_report_goods_search_dto>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new ReportServices().ReportGoodsExport(search_data,"","");
+            int rows = 0;
+            var memory = new ReportServices().ReportGoodsExport(search_data,"","",out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -136,7 +140,9 @@ namespace AutoTurnOver.Services
 
             dc_report_goods_platform_search_dto search_data = par_json.ToObject<dc_report_goods_platform_search_dto>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new ReportServices().ReportPlatformGoodsExport(search_data,"","");
+            var rows = 0;
+            var memory = new ReportServices().ReportPlatformGoodsExport(search_data,"","",out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -150,7 +156,9 @@ namespace AutoTurnOver.Services
 
             Condition_AutoTurnOver search_data = par_json.ToObject<Condition_AutoTurnOver>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new SkuAutoTurnServices().ProfitAnalysisExport(search_data);
+            var rows = 0;
+            var memory = new SkuAutoTurnServices().ProfitAnalysisExport(search_data,out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -165,7 +173,9 @@ namespace AutoTurnOver.Services
 
             export_sortage_push_search_dto search_data = par_json.ToObject<export_sortage_push_search_dto>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new DailyServices().ExportShortagePush(search_data);
+            int rows = 0;
+            var memory = new DailyServices().ExportShortagePush(search_data,out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -176,10 +186,11 @@ namespace AutoTurnOver.Services
         /// </summary>
         public async Task<string> DownloadStock(string par_json, dc_task_download download_data)
         {
-    
+            var rows = 0;
             dc_base_stock_search_dto search_data = par_json.ToObject<dc_base_stock_search_dto>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new DailyServices().Export(search_data);
+            var memory = new DailyServices().Export(search_data,out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -301,7 +312,9 @@ namespace AutoTurnOver.Services
     
             dc_base_stock_search_dto search_data = par_json.ToObject<dc_base_stock_search_dto>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new DailyServices().FbaExport(search_data);
+            int rows = 0;
+            var memory = new DailyServices().FbaExport(search_data,out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -314,7 +327,9 @@ namespace AutoTurnOver.Services
         {
             Condition_AutoTurnOver search_data = par_json.ToObject<Condition_AutoTurnOver>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new SkuAutoTurnServices().Export(search_data,"","");
+            int rows = 0;
+            var memory = new SkuAutoTurnServices().Export(search_data,"","",out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");
@@ -327,7 +342,9 @@ namespace AutoTurnOver.Services
         {
             Condition_AutoTurnOver search_data = par_json.ToObject<Condition_AutoTurnOver>();
             Console.WriteLine("DownloadStock - 开始生成文件");
-            var memory = new SkuAutoTurnServices().ExportSalesTemplate(search_data,"","");
+            int rows = 0;
+            var memory = new SkuAutoTurnServices().ExportSalesTemplate(search_data,"","",out rows);
+            download_data.rows = rows;
             Console.WriteLine("DownloadStock - 开始生成上传文件");
             var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
             Console.WriteLine("DownloadStock - 上传完毕");