Commit 2807400a by 泽锋 李

fix

parent a63dc599
...@@ -445,6 +445,7 @@ t1.usable_stock + t1.occupy_stock as 'sum_usable_stock', ...@@ -445,6 +445,7 @@ t1.usable_stock + t1.occupy_stock as 'sum_usable_stock',
(t1.usable_stock + t4.quantity_transfer + t4.quantity_purchase ) as 'sum_actual_stock', (t1.usable_stock + t4.quantity_transfer + t4.quantity_purchase ) as 'sum_actual_stock',
( (t6.turnover_sales*t6.quantity_safe_inventory) ) as 'turnover_days_quantity', ( (t6.turnover_sales*t6.quantity_safe_inventory) ) as 'turnover_days_quantity',
t6.turnover_days as 'turnover_days',
t3.moq, t3.moq,
t3.tags, t3.tags,
......
...@@ -170,18 +170,22 @@ namespace AutoTurnOver.Models ...@@ -170,18 +170,22 @@ namespace AutoTurnOver.Models
/// <summary> /// <summary>
/// 供应链长度所需库存 /// 供应链长度所需库存
/// </summary> /// </summary>
public decimal turnover_days_quantity { get; set; } public decimal? turnover_days_quantity { get; set; }
/// <summary>
/// 供应链长度
/// </summary>
public int? turnover_days { get; set; }
/// <summary> /// <summary>
/// 供应链长度所需库存 (缺货) /// 供应链长度所需库存 (缺货)
/// </summary> /// </summary>
public decimal turnover_days_outofstock_quantity { get { public decimal? turnover_days_outofstock_quantity { get {
return Math.Max(0, turnover_days_quantity - sum_actual_stock); return Math.Max(0, (turnover_days_quantity??0) - sum_actual_stock);
} } } }
/// <summary> /// <summary>
/// 供应链长度所需库存 (冗余) /// 供应链长度所需库存 (冗余)
/// </summary> /// </summary>
public decimal turnover_days_redundancy_quantity { get { public decimal? turnover_days_redundancy_quantity { get {
return Math.Max(0, sum_actual_stock-turnover_days_quantity ); return Math.Max(0, sum_actual_stock-(turnover_days_quantity??0) );
} } } }
......
...@@ -270,7 +270,7 @@ namespace AutoTurnOver.Services ...@@ -270,7 +270,7 @@ namespace AutoTurnOver.Services
"监控状态","开发时间","昨日销量","停售状态","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","moq","品牌","标签","类型","产品尺寸","包装尺寸","安全库存","销售员","海外仓入库天数", "监控状态","开发时间","昨日销量","停售状态","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","moq","品牌","标签","类型","产品尺寸","包装尺寸","安全库存","销售员","海外仓入库天数",
"采购陆运在途","采购海运在途","采购空运在途","采购铁路在途","调拨陆运在途","调拨海运在途","调拨空运在途","调拨铁路在途", "采购陆运在途","采购海运在途","采购空运在途","采购铁路在途","调拨陆运在途","调拨海运在途","调拨空运在途","调拨铁路在途",
"调拨最快到货时间","调拨最快到货单号","调拨最快到货数量","调拨最快到货跟踪号","调拨最快到货运输方式","调拨最快到到货物流","周转表更新时间", "调拨最快到货时间","调拨最快到货单号","调拨最快到货数量","调拨最快到货跟踪号","调拨最快到货运输方式","调拨最快到到货物流","周转表更新时间",
"供应链预测销量","供应链预测缺货","供应链预测冗余" "供应链长度天数","供应链预测销量","供应链预测缺货","供应链预测冗余"
}; };
foreach (var item in cols) foreach (var item in cols)
{ {
...@@ -280,6 +280,7 @@ namespace AutoTurnOver.Services ...@@ -280,6 +280,7 @@ namespace AutoTurnOver.Services
foreach (var itemData in list) foreach (var itemData in list)
{ {
DataRow row = table.NewRow(); DataRow row = table.NewRow();
row["供应链长度天数"] = itemData.turnover_days;
row["供应链预测销量"] = itemData.turnover_days_quantity; row["供应链预测销量"] = itemData.turnover_days_quantity;
row["供应链预测缺货"] = itemData.turnover_days_outofstock_quantity; row["供应链预测缺货"] = itemData.turnover_days_outofstock_quantity;
row["供应链预测冗余"] = itemData.turnover_days_redundancy_quantity; row["供应链预测冗余"] = itemData.turnover_days_redundancy_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