Commit e2ac0272 by lizefeng

查看预测图表页面空白处增加预测销量公式

parent e096cee0
...@@ -256,12 +256,12 @@ namespace AutoTurnOver.DB ...@@ -256,12 +256,12 @@ namespace AutoTurnOver.DB
/// <param name="sku">产品SKU</param> /// <param name="sku">产品SKU</param>
/// <param name="wCode">仓库编码</param> /// <param name="wCode">仓库编码</param>
/// <returns></returns> /// <returns></returns>
public static dc_auto_turnover GetModel(string sku,string wCode) public static Models.dc_auto_turnover GetModel(string sku,string wCode)
{ {
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
parameters.Add("bailun_sku",sku); parameters.Add("bailun_sku",sku);
parameters.Add("warehouse_code", wCode); parameters.Add("warehouse_code", wCode);
return _connection.QueryFirst<dc_auto_turnover>(" select * from dc_auto_turnover where bailun_sku=@bailun_sku and warehouse_code=@wCode ", parameters); return _connection.QueryFirst<Models.dc_auto_turnover>(" select * from dc_auto_turnover where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", parameters);
} }
} }
......
...@@ -219,6 +219,6 @@ namespace AutoTurnOver.Services ...@@ -219,6 +219,6 @@ namespace AutoTurnOver.Services
return list; return list;
} }
} }
} }
...@@ -28,6 +28,16 @@ namespace AutoTurnOver.Services ...@@ -28,6 +28,16 @@ namespace AutoTurnOver.Services
{ {
return DB.SaleVolume.GetById(id); return DB.SaleVolume.GetById(id);
} }
/// <summary>
/// 获取sku预测销量详情信息
/// </summary>
/// <param name="id">主键id</param>
/// <returns></returns>
public dc_sales_volume GetBySkuWarehouseCode(string sku, string warehousecode)
{
return DB.SaleVolume.GetBySkuWarehouseCode(sku, warehousecode);
}
} }
} }
...@@ -104,5 +104,10 @@ namespace AutoTurnOver.Services ...@@ -104,5 +104,10 @@ namespace AutoTurnOver.Services
#endregion #endregion
public dc_auto_turnover GetModel(string sku, string wCode)
{
return DB.dc_auto_turnover.GetModel(sku, wCode);
}
} }
} }
...@@ -36,15 +36,16 @@ namespace AutoTurnOver.Controllers ...@@ -36,15 +36,16 @@ namespace AutoTurnOver.Controllers
//[0.13, 0.12, 0.11, 0.11, 0.1, 0.09, 0.09, 0.08, 0.08, 0.07, 0.06, 0.06, 0.05, 0.04, 0.04, 0.03, 0.02, 0.02, 0.01, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0] //[0.13, 0.12, 0.11, 0.11, 0.1, 0.09, 0.09, 0.08, 0.08, 0.07, 0.06, 0.06, 0.05, 0.04, 0.04, 0.03, 0.02, 0.02, 0.01, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
var date = new List<string>(); var date = new List<string>();
var today = DateTime.Now; var today = DateTime.Now;
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
date.Add(today.AddDays(i).ToString("MM/dd")); date.Add(today.AddDays(i).ToString("MM/dd"));
} }
var names = new List<string>() { "预测销量","预计入库","可用库存","预计缺货数量"}; var names = new List<string>() { "预测销量", "预计入库", "可用库存", "预计缺货数量" };
var turnoverData = new Services.SkuAutoTurnServices().GetModel(sku, warehousecode);
return new JsonResult(new { data = result, days = date, names = names}); var saleVolumeData = new Services.SaleVolumeServices().GetBySkuWarehouseCode(sku, warehousecode);
return new JsonResult(new { data = result, turnoverData, saleVolumeData, days = date, names });
} }
} }
......
...@@ -63,6 +63,7 @@ namespace AutoTurnOver ...@@ -63,6 +63,7 @@ namespace AutoTurnOver
builder.AllowAnyOrigin() builder.AllowAnyOrigin()
.AllowAnyMethod() .AllowAnyMethod()
.AllowAnyHeader() .AllowAnyHeader()
.AllowCredentials()
); );
app.UseMvc(routes => app.UseMvc(routes =>
......
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