Commit b5192314 by 泽锋 李

离线下载,支持商品销量统计

parent 38df9212
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace AutoTurnOver.Models.Report
......@@ -85,7 +86,11 @@ namespace AutoTurnOver.Models.Report
public class bailun_sku_goods_search_dto
{
public bool? has_sum { get; set; }
[Description("商品内部编码")]
public string product_inner_code { get; set; }
[Description("平台")]
public string platform_type { get; set; }
}
public class bailun_sku_goods_dto
......
......@@ -789,14 +789,13 @@ namespace AutoTurnOver.Services
}
public MemoryStream GetGoodsExport(bailun_sku_goods_search_dto search_data,UserData user)
public string GetGoodsExport(bailun_sku_goods_search_dto search_data)
{
try
{
var qiniuname = $"{user.UserAccount}商品汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}.csv";
var fileName = AppContext.BaseDirectory + $@"Result\RealtimeStock\{user.UserAccount}商品汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}.csv";
var fileName = AppContext.BaseDirectory + $@"商品销售情况汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}{Guid.NewGuid()}.csv";
var total = 0;
var list = GetGoods(search_data, 0, int.MaxValue, ref total);
......@@ -841,15 +840,15 @@ namespace AutoTurnOver.Services
CsvFileHelper.SaveCSV(table, fileName, true);
return fileName;
//var memory = new MemoryStream();
//using (var stream = new FileStream(fileName, FileMode.Open))
//{
// stream.CopyTo(memory);
//}
//memory.Position = 0;
var memory = new MemoryStream();
using (var stream = new FileStream(fileName, FileMode.Open))
{
stream.CopyTo(memory);
}
memory.Position = 0;
return memory;
//return memory;
}
catch (Exception ex)
{
......
......@@ -9,6 +9,7 @@ using AutoTurnOver.DB;
using Dapper;
using System.Linq;
using System.Threading.Tasks;
using AutoTurnOver.Models.Report;
namespace AutoTurnOver.Services
{
......@@ -43,6 +44,9 @@ namespace AutoTurnOver.Services
case "改在线记录":
item.result_file_url = await DownloadShortagePush(item.parameter, item);
break;
case "商品销售情况统计":
item.result_file_url = await DownloadGoods(item.parameter, item);
break;
default: throw new Exception("无法识别的任务");
}
item.end_date = DateTime.Now;
......@@ -63,6 +67,21 @@ namespace AutoTurnOver.Services
/// <summary>
/// 商品销售情况统计
/// </summary>
public async Task<string> DownloadGoods(string par_json, dc_task_download download_data)
{
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);
Console.WriteLine("DownloadStock - 开始生成上传文件");
var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
Console.WriteLine("DownloadStock - 上传完毕");
return fileData;
}
/// <summary>
/// 下载改在线记录
/// </summary>
public async Task<string> DownloadShortagePush(string par_json, dc_task_download download_data)
......
......@@ -1135,17 +1135,25 @@ namespace AutoTurnOver.Controllers
});
}
public async Task<FileResult> GetGoodsExport(string product_inner_code, string platform_type)
public ActionResult GetGoodsExport([FromForm] bailun_sku_goods_search_dto m)
{
var user = AutoUtility.GetUser();
var m = new bailun_sku_goods_search_dto
{
product_inner_code = product_inner_code,
platform_type = platform_type
};
var memory = new ReportServices().GetGoodsExport(m, user);
var fileData = await QiNiuCloudHelper.UploadAsync(memory, $"商品销售情况统计{user.UserName}-{DateTime.Now.ToString("yyyyMMddHHmmss")}导入结果.csv");
return File(memory, "text/csv", $"{user.UserAccount}商品汇总数据信息.csv");
dc_task_download_dao.PushData<dc_base_stock_search_dto>(new dc_task_download
{
parameter = m.ToJson(),
task_name = "商品销售情况统计"
}, user);
return new JsonResult(new { success = true });
//var user = AutoUtility.GetUser();
//var m = new bailun_sku_goods_search_dto
//{
// product_inner_code = product_inner_code,
// platform_type = platform_type
//};
//var memory = new ReportServices().GetGoodsExport(m, user);
//var fileData = await QiNiuCloudHelper.UploadAsync(memory, $"商品销售情况统计{user.UserName}-{DateTime.Now.ToString("yyyyMMddHHmmss")}导入结果.csv");
//return File(memory, "text/csv", $"{user.UserAccount}商品汇总数据信息.csv");
}
[BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【报表】->【商品销售情况统计】->【搜索】页面", 0)]
public JsonResult GetGoodsSumFooter(string product_inner_code, string platform_type)
......
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