Commit 0cc3b764 by 泽锋 李

fix

parent 2e95eea7
...@@ -29,5 +29,9 @@ namespace AutoTurnOver.DB ...@@ -29,5 +29,9 @@ namespace AutoTurnOver.DB
public int transfer_delivery { get; set; } public int transfer_delivery { get; set; }
public int transfer_bale_delivery { get; set; } public int transfer_bale_delivery { get; set; }
public int abroad_inbound_delivery { get; set; } public int abroad_inbound_delivery { get; set; }
public int turnover_sales { get; set; }
public int usable_stock { get; set; }
public int quantity_transfer { get; set; }
public int quantity_purchase { get; set; }
} }
} }
...@@ -9,7 +9,7 @@ namespace AutoTurnOver.Models.Report ...@@ -9,7 +9,7 @@ namespace AutoTurnOver.Models.Report
/// <summary> /// <summary>
/// 实际建议周转数 /// 实际建议周转数
/// </summary> /// </summary>
public decimal? quantity_final_advise; public int? quantity_final_advise;
/// <summary> /// <summary>
/// 实际周转数 /// 实际周转数
...@@ -43,7 +43,7 @@ namespace AutoTurnOver.Models.Report ...@@ -43,7 +43,7 @@ namespace AutoTurnOver.Models.Report
/// <summary> /// <summary>
/// 海运周转数(推荐海运) /// 海运周转数(推荐海运)
/// </summary> /// </summary>
public decimal? quantity_final_advise_ocean; public int? quantity_final_advise_ocean;
/// <summary> /// <summary>
/// 海运周转运费 /// 海运周转运费
......
...@@ -28,7 +28,7 @@ namespace AutoTurnOver.Models ...@@ -28,7 +28,7 @@ namespace AutoTurnOver.Models
} }
else else
{ {
return (val ?? 0).ToString("N"); return Math.Round((val ?? 0),2).ToString("N");
} }
} } } }
......
...@@ -17,7 +17,7 @@ namespace ResetOutofstock ...@@ -17,7 +17,7 @@ namespace ResetOutofstock
{ {
var now = DateTime.Now; var now = DateTime.Now;
dc_auto_turnover.CopyForecast(); dc_auto_turnover.CopyForecast();
//report.GenerateWeekTagStockDatas(); //report.GenerateWeekTagStockDatas();
//dc_base_transfer_extend_dao.SynchroLmsTransferOrder(); //dc_base_transfer_extend_dao.SynchroLmsTransferOrder();
} }
......
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