Commit b212881e by 泽锋 李

周转表导出,新增仓库所属国家字段

parent b2b37332
...@@ -62,9 +62,10 @@ t4.develop_time,(case when t8.id is null then '未侵权' else '侵权' end) as ...@@ -62,9 +62,10 @@ t4.develop_time,(case when t8.id is null then '未侵权' else '侵权' end) as
( case when t5.`status`=0 or t5.`status` is null then null else t5.gmt_create end ) as 'stop_monitor_create', ( case when t5.`status`=0 or t5.`status` is null then null else t5.gmt_create end ) as 'stop_monitor_create',
t4.category_simple_name, t4.category_simple_name,
t4.brand as 'brand', t4.brand as 'brand',
t7.first_inbound_date, t7.first_inbound_date,
t3.area_name,
t13.quantity_land_purchase as 'quantity_land_purchase', t13.quantity_land_purchase as 'quantity_land_purchase',
t13.quantity_ocean_purchase as 'quantity_ocean_purchase', t13.quantity_ocean_purchase as 'quantity_ocean_purchase',
t13.quantity_air_purchase as 'quantity_air_purchase', t13.quantity_air_purchase as 'quantity_air_purchase',
......
...@@ -425,6 +425,7 @@ namespace AutoTurnOver.Models ...@@ -425,6 +425,7 @@ namespace AutoTurnOver.Models
public class dc_auto_turnover_list_dto public class dc_auto_turnover_list_dto
{ {
public string area_name { get; set; }
public string head_transport_type { get; set; } public string head_transport_type { get; set; }
public string head_transport_logistics_code { get; set; } public string head_transport_logistics_code { get; set; }
/// <summary> /// <summary>
......
...@@ -296,7 +296,7 @@ namespace AutoTurnOver.Services ...@@ -296,7 +296,7 @@ namespace AutoTurnOver.Services
var list = service.List(m, (page - 1) * rows, rows, ref total, order, sort); var list = service.List(m, (page - 1) * rows, rows, ref total, order, sort);
if (list == null || list.Count <= 0) break; if (list == null || list.Count <= 0) break;
DataTable table = new DataTable(); DataTable table = new DataTable();
string[] cols = new string[] { "Sku","商品编码", "内部编码", "sku标题", "仓库编码", "仓库名称", "MOQ", string[] cols = new string[] { "Sku","商品编码", "内部编码", "sku标题", "仓库编码", "仓库名称","仓库所在国家", "MOQ",
"采购在途", "调拨在途", "昨日销量", "明日销量", "未来7天日均", "未来14天日均", "建议采购数", "活动促销数量", "采购在途", "调拨在途", "昨日销量", "明日销量", "未来7天日均", "未来14天日均", "建议采购数", "活动促销数量",
"实际库存", "安全库存", "周转天数", "供应商交期", "质检入库天数", "调拨头程天数", "预测是否断货", "缺货数量","监控状态","供应商","采购员","交期异常", "实际库存", "安全库存", "周转天数", "供应商交期", "质检入库天数", "调拨头程天数", "预测是否断货", "缺货数量","监控状态","供应商","采购员","交期异常",
"过去7天日均","过去14天日均","过去30天日均","重量","单价","实时库存","ebay最近7天日均销量","ebay最近14天日均销量","ebay最近30天日均销量" "过去7天日均","过去14天日均","过去30天日均","重量","单价","实时库存","ebay最近7天日均销量","ebay最近14天日均销量","ebay最近30天日均销量"
...@@ -313,6 +313,7 @@ namespace AutoTurnOver.Services ...@@ -313,6 +313,7 @@ namespace AutoTurnOver.Services
foreach (var itemData in list) foreach (var itemData in list)
{ {
DataRow row = table.NewRow(); DataRow row = table.NewRow();
row["仓库所在国家"] = itemData.area_name;
row["销量预测规则"] = itemData.dc_auto_sales_forecast_title; row["销量预测规则"] = itemData.dc_auto_sales_forecast_title;
row["采购陆运在途数量"] = itemData.quantity_land_purchase; row["采购陆运在途数量"] = itemData.quantity_land_purchase;
row["采购海运在途数量"] = itemData.quantity_ocean_purchase; row["采购海运在途数量"] = itemData.quantity_ocean_purchase;
......
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