Commit bca0ac18 by 泽锋 李

周转表仓库名称校准

parent 9430ae37
...@@ -53,7 +53,7 @@ where 1=1 "; ...@@ -53,7 +53,7 @@ where 1=1 ";
} }
else else
{ {
sql = @"select (t3.warehouse_name) as warehouse_name,dat.*,t2.oneday_sales,t2.forecast_oneday_sales as 'forecast_oneday_sales2', sql = @"select (t3.warehouse_name) as 'db_warehouse_name', dat.*,t2.oneday_sales,t2.forecast_oneday_sales as 'forecast_oneday_sales2',
t4.bailun_category_name, t4.bailun_category_name,
t3.hq_type as 'warehouse_type', t3.hq_type as 'warehouse_type',
( case when t5.`status`=0 or t5.`status` is null then 0 else 1 end ) as 'monitor_status', ( case when t5.`status`=0 or t5.`status` is null then 0 else 1 end ) as 'monitor_status',
......
...@@ -482,6 +482,7 @@ namespace AutoTurnOver.Models ...@@ -482,6 +482,7 @@ namespace AutoTurnOver.Models
/// 调拨单在途 /// 调拨单在途
/// </summary> /// </summary>
public int quantity_transfer_order { get; set; } public int quantity_transfer_order { get; set; }
public string db_warehouse_name { get; set; }
/// <summary> /// <summary>
/// 调拨单采购临时数据 /// 调拨单采购临时数据
......
...@@ -336,7 +336,7 @@ namespace AutoTurnOver.Services ...@@ -336,7 +336,7 @@ namespace AutoTurnOver.Services
row["内部编码"] = itemData.product_inner_code; row["内部编码"] = itemData.product_inner_code;
row["sku标题"] = itemData.sku_title; row["sku标题"] = itemData.sku_title;
row["仓库编码"] = itemData.warehouse_code; row["仓库编码"] = itemData.warehouse_code;
row["仓库名称"] = itemData.warehouse_name; row["仓库名称"] = itemData.db_warehouse_name;
row["MOQ"] = itemData.quantity_minimum_order; row["MOQ"] = itemData.quantity_minimum_order;
row["采购在途"] = itemData.quantity_purchase; row["采购在途"] = itemData.quantity_purchase;
......
...@@ -135,7 +135,7 @@ namespace AutoTurnOver.Controllers ...@@ -135,7 +135,7 @@ namespace AutoTurnOver.Controllers
var row = table.NewRow(); var row = table.NewRow();
row["SKU"] = item.bailun_sku; row["SKU"] = item.bailun_sku;
row["标题"] = item.sku_title; row["标题"] = item.sku_title;
row["仓库"] = item.warehouse_name; row["仓库"] = item.db_warehouse_name;
row["仓库编码"] = item.warehouse_code; row["仓库编码"] = item.warehouse_code;
row["仓库类型"] = item.warehouse_type; row["仓库类型"] = item.warehouse_type;
row["昨日销量"] = item.oneday_sales; row["昨日销量"] = item.oneday_sales;
......
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