Commit 4016c712 by 泽锋 李

1、明细页面加一个下载

3、明细页面,新增平台,站点,仓库字段
4、新增一个【采购-首单】【调拨-首单】的数据统计类型(如果1个月后出单了,则从该节点分摊到各个平台)
5、移除备注列,变成鼠标划入显示
parent 728fc22e
......@@ -210,6 +210,7 @@ namespace AutoTurnOver.Models
public class dc_report_cash_flow_log_export_search_dto
{
public DateTime? btime { get; set; }
public bool issum { get; set; }
public DateTime? etime { get; set; }
public List<int> data_type { get; set; }
/// <summary>
......@@ -221,6 +222,7 @@ namespace AutoTurnOver.Models
public string warehouse_code { get; set; }
public string platform_type { get; set; }
public string web_site { get; set; }
public int? view_type { get; set; }
}
public class dc_report_cash_flow_log_export_page_search_dto: page_search_dto
......
......@@ -38,22 +38,30 @@ namespace AutoTurnOver.Controllers
});
}
public FileResult Export(DateTime? btime, DateTime? etime, string bailun_sku, string data_type = null, int? type = null)
public FileResult Export(DateTime? btime, DateTime? etime, string bailun_sku, string data_type = null, int? type = null, string platform_type = null, string warehouse_code = null, string web_site = "", int? view_type = 1)
{
var m = new dc_report_cash_flow_log_export_search_dto
var m = new dc_report_cash_flow_log_export_page_search_dto
{
data_type = string.IsNullOrWhiteSpace(data_type) ? new List<int> { } : data_type.Split(',').Select(s => int.Parse(s)).ToList(),
btime = btime,
etime = etime,
type = type,
bailun_sku = bailun_sku
bailun_sku = bailun_sku,
page =1,
rows = int.MaxValue,
platform_type = platform_type,
issum = false,
warehouse_code = warehouse_code,
web_site = web_site,
view_type = view_type
};
var service = new Services.CashFlowServices();
var list = service.Export(m);
var list = service.LogPage(m).Items;
DataTable table = new DataTable();
string[] cols = new string[] { "Sku","仓库编码","仓库名称","平台","数据类型","金额","发生时间","支付时间","相关单号","备注"
string[] cols = new string[] { "Sku","仓库编码","仓库名称","平台","站点","数据类型","金额","时间","相关单号","备注"
};
foreach (var item in cols)
{
......@@ -69,10 +77,10 @@ namespace AutoTurnOver.Controllers
row["仓库编码"] = itemData.warehouse_code;
row["仓库名称"] = itemData.warehouse_name;
row["平台"] = itemData.platform_type;
row["平台"] = itemData.web_site;
row["数据类型"] = itemData.data_type_str;
row["发生时间"] = itemData.occur_time;
row["支付时间"] = itemData.pay_time;
row["相关单号"] = itemData.item_no;
row["时间"] = itemData.show_time;
row["相关单号"] = itemData.no;
row["备注"] = itemData.remarks;
row["金额"] = itemData.val;
......
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