Commit 8e171ad1 by 泽锋 李

新增当前页导出

parent 3dbed57b
......@@ -587,6 +587,11 @@ namespace AutoTurnOver.Models
public decimal history_thirtyday_sales_walmart { get; set; }
}
public class ana_search_dto: Condition_AutoTurnOver
{
public int page { get; set; }
public int rows { get; set; }
}
public class Condition_AutoTurnOver
{
......
......@@ -154,10 +154,10 @@ namespace AutoTurnOver.Services
public async Task<string> DownloadProfitAnalysis(string par_json, dc_task_download download_data)
{
Condition_AutoTurnOver search_data = par_json.ToObject<Condition_AutoTurnOver>();
ana_search_dto search_data = par_json.ToObject<ana_search_dto>();
Console.WriteLine("DownloadStock - 开始生成文件");
var rows = 0;
var memory = new SkuAutoTurnServices().ProfitAnalysisExport(search_data,out rows);
var memory = new SkuAutoTurnServices().ProfitAnalysisExport(search_data, out rows);
download_data.rows = rows;
Console.WriteLine("DownloadStock - 开始生成上传文件");
var fileData = await AutoTurnOver.Utility.QiNiuCloudHelper.UploadSectioningAsync(memory);
......
......@@ -105,12 +105,12 @@ namespace AutoTurnOver.Controllers
return new JsonResult(list == null || list.Count <= 0 ? new dc_report_profit_analysis_dto() : list[0]);
}
public JsonResult ExportProfitAnalysis([FromQuery] dc_base_stock_search_dto search_data)
public JsonResult ExportProfitAnalysis([FromQuery] ana_search_dto search_data)
{
try
{
var user = AutoUtility.GetUser();
dc_task_download_dao.PushData<dc_base_stock_search_dto>(new dc_task_download
dc_task_download_dao.PushData<ana_search_dto>(new dc_task_download
{
parameter = search_data.ToJson(),
task_name = "利润最大化分析"
......@@ -124,6 +124,7 @@ namespace AutoTurnOver.Controllers
}
[HttpGet]
[BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动周转列表】->【空运海运利润计算】->【搜索】页面", 0)]
public JsonResult TransferProfitList(string bailun_sku, string warehouse_code)
......
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