Commit 05b3c93b by guanzhenshan

调整导出文件方式,增加兼容docker导出

parent f4562006
...@@ -132,11 +132,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -132,11 +132,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
); );
} }
var guid = Guid.NewGuid().ToString();
var filename = "sku发货重量差异 " + DateTime.Now.ToString("yyyyMMddHHmmss"); var filename = "sku发货重量差异 " + DateTime.Now.ToString("yyyyMMddHHmmss");
var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\"; var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
ToCSV(list, colNames, filename, filepath); ToCSV(list, colNames, guid, filepath);
return File("~/Files/Report/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + filename + ".csv", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", filename + ".csv"); var ms = new System.IO.MemoryStream();
using (var f = new System.IO.FileStream(filepath + guid + ".csv", System.IO.FileMode.Open))
{
f.CopyTo(ms);
}
ms.Position = 0;
return File(ms, "text/csv", filename + ".csv");
} }
} }
......
...@@ -342,11 +342,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -342,11 +342,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
break; break;
} }
var guid = Guid.NewGuid().ToString();
var filename = title +" "+ DateTime.Now.ToString("yyyyMMddHHmmss"); var filename = title +" "+ DateTime.Now.ToString("yyyyMMddHHmmss");
var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\"; var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
ToCSV(list, listCol, filename, filepath); ToCSV(list, listCol, guid, filepath);
return File("~/Files/Report/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + filename + ".csv", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", filename + ".csv"); var ms = new System.IO.MemoryStream();
using (var f = new System.IO.FileStream(filepath + guid + ".csv", System.IO.FileMode.Open))
{
f.CopyTo(ms);
}
ms.Position = 0;
return File(ms, "text/csv", filename + ".csv");
} }
return View(""); return View("");
......
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