Commit 9c877467 by 泽锋 李

实时库存,加一个库存金额+在途库存金额

parent 268188ce
......@@ -281,10 +281,13 @@ sum(t1.occupy_order) as 'occupy_order',
sum(t4.quantity_purchase) as 'purchase_daily_quantity',
sum(t4.quantity_purchase) as 'realtime_quantity_purchase',
sum(t4.quantity_transfer) as 'realtime_quantity_transfer',
sum(t4.quantity_out_stock) as 'quantity_out_stock'
sum(t4.quantity_out_stock) as 'quantity_out_stock',
sum((t1.usable_stock * ifnull(t3.unit_price,0))) as 'usable_stock_amount',
sum((ifnull(t4.quantity_purchase,0) + ifnull(t4.quantity_transfer,0)) * ifnull(t3.unit_price,0)) as 'on_the_way_stock_amount'
from
dc_base_stock as t1
left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
left join dc_mid_transit as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
";
if (has_tort != null)
......@@ -314,6 +317,8 @@ t6.history_sevenday_sales_aliexpress,t6.history_fourteenday_sales_aliexpress,t6.
t6.history_sevenday_sales_amazon,t6.history_fourteenday_sales_amazon,t6.history_thirtyday_sales_amazon,
t3.moq,
t3.tags,
(t1.usable_stock * ifnull(t3.unit_price,0)) as 'usable_stock_amount',
(ifnull(t4.quantity_purchase,0) + ifnull(t4.quantity_transfer,0)) * ifnull(t3.unit_price,0) as 'on_the_way_stock_amount',
t3.product_size,
t3.product_type_desc,
t3.brand,
......
......@@ -166,6 +166,14 @@ namespace AutoTurnOver.Models
public class dc_base_stock_dto : dc_base_stock
{
public string brand { get; set; }
/// <summary>
/// 可配库存金额
/// </summary>
public decimal usable_stock_amount { get; set; }
/// <summary>
/// 总在途金额
/// </summary>
public decimal on_the_way_stock_amount { get; set; }
public string product_size { get; set; }
public string tags { get; set; }
public string product_type_desc { get; set; }
......
......@@ -157,9 +157,9 @@ namespace AutoTurnOver.Services
if (list == null || list.Count <= 0) break;
DataTable table = new DataTable();
string[] cols = new string[] { "百伦简易分类","Sku", "采购名称", "中文名","内部编码", "仓库编码", "仓库名称", "货主编码","实时采购在途","实时调拨在途"
string[] cols = new string[] { "百伦简易分类","Sku", "采购名称", "中文名","内部编码", "仓库编码", "仓库名称", "货主编码","实时采购在途","实时调拨在途","在途金额"
,"订货数量","运输在途","中转仓库存","冻结库存","供应商库存","预售库存","不良品库存","在途库存","收货待检"
,"待上架","可配库存","销售可用库存(聚合)","销售可用库存(私有)","销售可用库存(共享)","在仓库存(共享)","在仓库存(私有)","在仓库存(聚合)","仓库占用(共享)"
,"待上架","可配库存","可配库存金额","销售可用库存(聚合)","销售可用库存(私有)","销售可用库存(共享)","在仓库存(共享)","在仓库存(私有)","在仓库存(聚合)","仓库占用(共享)"
,"仓库占用(私有)","仓库占用(聚合)","活动占用","单占用(私有)","订单占用(共享)","订单占用(聚合)","环球更新时间","供应商","采购员","重量","单价","已发货库存","实时缺货","是否侵权",
"过去7日日均销量", "过去14日日均销量", "过去30日日均销量", "过去7日Eaby日均销量", "过去14日Eaby日均销量", "过去30日Eaby日均销量", "过去7日速卖通日均销量", "过去14日速卖通日均销量", "过去30日速卖通日均销量",
"监控状态","开发时间","昨日销量","停售状态","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","moq","品牌","标签","类型","产品尺寸"
......@@ -192,6 +192,7 @@ namespace AutoTurnOver.Services
row["收货待检"] = itemData.wait_check;
row["待上架"] = itemData.wait_putaway;
row["可配库存"] = itemData.usable_stock;
row["可配库存"] = itemData.usable_stock_amount;
row["销售可用库存(聚合)"] = itemData.usable_sales;
row["销售可用库存(私有)"] = itemData.usable_sales_private;
row["销售可用库存(共享)"] = itemData.usable_sales_share;
......@@ -209,6 +210,7 @@ namespace AutoTurnOver.Services
row["实时采购在途"] = itemData.realtime_quantity_purchase;
row["实时调拨在途"] = itemData.realtime_quantity_transfer;
row["在途金额"] = itemData.on_the_way_stock_amount;
row["供应商"] = itemData.suppliers_name;
row["采购员"] = itemData.buyer_name;
row["重量"] = itemData.weight;
......
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