Commit 4f2239a9 by zhoujinhui

周负利润新增字段

parent 1b529288
...@@ -28,6 +28,18 @@ namespace AutoTurnOver.DB ...@@ -28,6 +28,18 @@ namespace AutoTurnOver.DB
{ {
sql.Append($" AND t1.create_date_time < '{m.end_date}' "); sql.Append($" AND t1.create_date_time < '{m.end_date}' ");
} }
if (!string.IsNullOrWhiteSpace(m.platform))
{
sql.Append($" AND t1.platform = '{m.platform}' ");
}
if (!string.IsNullOrWhiteSpace(m.simple_category))
{
sql.Append($" AND t1.simple_category = '{m.simple_category}' ");
}
if (!string.IsNullOrWhiteSpace(m.buyer_name))
{
sql.Append($" AND t1.buyer_name = '{m.buyer_name}' ");
}
sql.Append(" ORDER BY t1.create_date_time DESC "); sql.Append(" ORDER BY t1.create_date_time DESC ");
try try
{ {
......
...@@ -43,6 +43,18 @@ namespace AutoTurnOver.DB ...@@ -43,6 +43,18 @@ namespace AutoTurnOver.DB
{ {
sql.Append($" AND t1.create_date_time < '{m.end_date}' "); sql.Append($" AND t1.create_date_time < '{m.end_date}' ");
} }
if (!string.IsNullOrWhiteSpace(m.platform))
{
sql.Append($" AND t1.platform = '{m.platform}' ");
}
if (!string.IsNullOrWhiteSpace(m.simple_category))
{
sql.Append($" AND t1.simple_category = '{m.simple_category}' ");
}
if (!string.IsNullOrWhiteSpace(m.buyer_name))
{
sql.Append($" AND t1.buyer_name = '{m.buyer_name}' ");
}
sql.Append(" ORDER BY t1.create_date_time DESC "); sql.Append(" ORDER BY t1.create_date_time DESC ");
try try
{ {
......
...@@ -46,6 +46,18 @@ namespace AutoTurnOver.DB ...@@ -46,6 +46,18 @@ namespace AutoTurnOver.DB
{ {
sql.Append($" AND t1.stockout_time < '{m.end_date}' "); sql.Append($" AND t1.stockout_time < '{m.end_date}' ");
} }
if (!string.IsNullOrWhiteSpace(m.platform))
{
sql.Append($" AND t1.platform = '{m.platform}' ");
}
if (!string.IsNullOrWhiteSpace(m.simple_category))
{
sql.Append($" AND t1.simple_category = '{m.simple_category}' ");
}
if (!string.IsNullOrWhiteSpace(m.buyer_name))
{
sql.Append($" AND t1.buyer_name = '{m.buyer_name}' ");
}
sql.Append(" ORDER BY t1.create_date_time DESC "); sql.Append(" ORDER BY t1.create_date_time DESC ");
try try
{ {
......
...@@ -21,5 +21,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics ...@@ -21,5 +21,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics
/// 缺货结束时间 /// 缺货结束时间
/// </summary> /// </summary>
public string end_date { get; set; } public string end_date { get; set; }
/// <summary>
/// 平台
/// </summary>
public string platform { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
/// <summary>
/// 简易分类
/// </summary>
public string simple_category { get; set; }
} }
} }
...@@ -21,5 +21,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics ...@@ -21,5 +21,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics
/// 缺货结束时间 /// 缺货结束时间
/// </summary> /// </summary>
public string end_date { get; set; } public string end_date { get; set; }
/// <summary>
/// 平台
/// </summary>
public string platform { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
/// <summary>
/// 简易分类
/// </summary>
public string simple_category { get; set; }
} }
} }
...@@ -21,5 +21,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics ...@@ -21,5 +21,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics
/// 缺货结束时间 /// 缺货结束时间
/// </summary> /// </summary>
public string end_date { get; set; } public string end_date { get; set; }
/// <summary>
/// 平台
/// </summary>
public string platform { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
/// <summary>
/// 简易分类
/// </summary>
public string simple_category { get; set; }
} }
} }
...@@ -75,5 +75,20 @@ namespace AutoTurnOver.Models ...@@ -75,5 +75,20 @@ namespace AutoTurnOver.Models
/// 最后同步时间 /// 最后同步时间
/// </summary> /// </summary>
public DateTime? last_synch_time { get; set; } public DateTime? last_synch_time { get; set; }
/// <summary>
/// 平台
/// </summary>
public string platform { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
/// <summary>
/// 简易分类
/// </summary>
public string simple_category { get; set; }
} }
} }
...@@ -76,5 +76,20 @@ namespace AutoTurnOver.Models ...@@ -76,5 +76,20 @@ namespace AutoTurnOver.Models
/// 最后同步时间 /// 最后同步时间
/// </summary> /// </summary>
public DateTime? last_synch_time { get; set; } public DateTime? last_synch_time { get; set; }
/// <summary>
/// 平台
/// </summary>
public string platform { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
/// <summary>
/// 简易分类
/// </summary>
public string simple_category { get; set; }
} }
} }
...@@ -91,5 +91,20 @@ namespace AutoTurnOver.Models ...@@ -91,5 +91,20 @@ namespace AutoTurnOver.Models
/// 最后同步时间 /// 最后同步时间
/// </summary> /// </summary>
public DateTime? last_synch_time { get; set; } public DateTime? last_synch_time { get; set; }
/// <summary>
/// 平台
/// </summary>
public string platform { get; set; }
/// <summary>
/// 采购员
/// </summary>
public string buyer_name { get; set; }
/// <summary>
/// 简易分类
/// </summary>
public string simple_category { get; set; }
} }
} }
...@@ -58,7 +58,7 @@ namespace AutoTurnOver.Controllers ...@@ -58,7 +58,7 @@ namespace AutoTurnOver.Controllers
DataTable table = new DataTable(); DataTable table = new DataTable();
string[] cols = new string[] { string[] cols = new string[] {
"商品编码", "SKU","名称", "周销量", "周gmv","周成本", "周退款数", "周退款金额", "利润率", "利润额","退款率","起始日期","结束日期","创建时间" "商品编码", "SKU","名称","平台", "简易分类","采购员", "周销量", "周gmv","周成本", "周退款数", "周退款金额", "利润率", "利润额","退款率","起始日期","结束日期","创建时间"
}; };
foreach (var item in cols) foreach (var item in cols)
{ {
...@@ -72,6 +72,9 @@ namespace AutoTurnOver.Controllers ...@@ -72,6 +72,9 @@ namespace AutoTurnOver.Controllers
row["商品编码"] = itemData.bailun_sku; row["商品编码"] = itemData.bailun_sku;
row["SKU"] = itemData.bailun_sku; row["SKU"] = itemData.bailun_sku;
row["名称"] = itemData.sku_title_cn; row["名称"] = itemData.sku_title_cn;
row["平台"] = itemData.platform;
row["简易分类"] = itemData.simple_category;
row["采购员"] = itemData.buyer_name;
row["周销量"] = itemData.weekly_sales; row["周销量"] = itemData.weekly_sales;
row["周gmv"] = itemData.weekly_gmv; row["周gmv"] = itemData.weekly_gmv;
row["周成本"] = itemData.weekly_cost; row["周成本"] = itemData.weekly_cost;
...@@ -136,7 +139,7 @@ namespace AutoTurnOver.Controllers ...@@ -136,7 +139,7 @@ namespace AutoTurnOver.Controllers
DataTable table = new DataTable(); DataTable table = new DataTable();
string[] cols = new string[] { string[] cols = new string[] {
"商品编码", "SKU", "仓库编码", "仓库名称", "入库时间", "过去7天日均", "总库存数", "总库存金额","冗余数","冗余金额","冗余发生日期","起始日期","结束日期","创建时间" "商品编码", "SKU", "仓库编码", "仓库名称","平台", "简易分类","采购员", "入库时间", "过去7天日均", "总库存数", "总库存金额","冗余数","冗余金额","冗余发生日期","起始日期","结束日期","创建时间"
}; };
foreach (var item in cols) foreach (var item in cols)
{ {
...@@ -151,6 +154,9 @@ namespace AutoTurnOver.Controllers ...@@ -151,6 +154,9 @@ namespace AutoTurnOver.Controllers
row["SKU"] = itemData.bailun_sku; row["SKU"] = itemData.bailun_sku;
row["仓库编码"] = itemData.warehouse_code; row["仓库编码"] = itemData.warehouse_code;
row["仓库名称"] = itemData.warehouse_name; row["仓库名称"] = itemData.warehouse_name;
row["平台"] = itemData.platform;
row["简易分类"] = itemData.simple_category;
row["采购员"] = itemData.buyer_name;
row["入库时间"] = itemData.warehousing_time; row["入库时间"] = itemData.warehousing_time;
row["过去7天日均"] = itemData.seven_days_average; row["过去7天日均"] = itemData.seven_days_average;
row["总库存数"] = itemData.total_inventory; row["总库存数"] = itemData.total_inventory;
...@@ -212,7 +218,7 @@ namespace AutoTurnOver.Controllers ...@@ -212,7 +218,7 @@ namespace AutoTurnOver.Controllers
DataTable table = new DataTable(); DataTable table = new DataTable();
string[] cols = new string[] { string[] cols = new string[] {
"商品编码", "SKU", "仓库编码", "仓库名称", "入库时间", "历史采购数量", "历史销售数量", "过去7天日均","缺货时间","pds开发竞品item", "商品编码", "SKU", "仓库编码", "仓库名称","平台", "简易分类","采购员", "入库时间", "历史采购数量", "历史销售数量", "过去7天日均","缺货时间","pds开发竞品item",
"ana市场模糊7日均","第一销售平台7日均","第二销售平台7日均","安全库存","创建时间" "ana市场模糊7日均","第一销售平台7日均","第二销售平台7日均","安全库存","创建时间"
}; };
foreach (var item in cols) foreach (var item in cols)
...@@ -228,6 +234,9 @@ namespace AutoTurnOver.Controllers ...@@ -228,6 +234,9 @@ namespace AutoTurnOver.Controllers
row["SKU"] = itemData.bailun_sku; row["SKU"] = itemData.bailun_sku;
row["仓库编码"] = itemData.warehouse_code; row["仓库编码"] = itemData.warehouse_code;
row["仓库名称"] = itemData.warehouse_code; row["仓库名称"] = itemData.warehouse_code;
row["平台"] = itemData.platform;
row["简易分类"] = itemData.simple_category;
row["采购员"] = itemData.buyer_name;
row["入库时间"] = itemData.warehousing_time; row["入库时间"] = itemData.warehousing_time;
row["历史采购数量"] = itemData.historical_purchase_quantity; row["历史采购数量"] = itemData.historical_purchase_quantity;
row["历史销售数量"] = itemData.historical_sales_quantity; row["历史销售数量"] = itemData.historical_sales_quantity;
......
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