Commit 6b33b226 by 泽锋 李

fix

parent 718b7832
...@@ -400,6 +400,7 @@ namespace AutoTurnOver.Services ...@@ -400,6 +400,7 @@ namespace AutoTurnOver.Services
List<dc_auto_purchase_advise_detailed_dto> datas = new List<dc_auto_purchase_advise_detailed_dto>(); List<dc_auto_purchase_advise_detailed_dto> datas = new List<dc_auto_purchase_advise_detailed_dto>();
var total = 0; var total = 0;
System.Threading.Thread.Sleep( 10 * 1000);
datas.AddRange(PurchaseAdviseServices.DetailList(new dc_auto_purchase_advise_detailed_search_dto { data_base_type = 1, main_id = mainID, ispush = false }, 0, int.MaxValue, ref total)); datas.AddRange(PurchaseAdviseServices.DetailList(new dc_auto_purchase_advise_detailed_search_dto { data_base_type = 1, main_id = mainID, ispush = false }, 0, int.MaxValue, ref total));
Console.WriteLine($"查询建议数,total:{datas.Count}"); Console.WriteLine($"查询建议数,total:{datas.Count}");
//datas.AddRange(PurchaseAdviseServices.DetailList(new dc_auto_purchase_advise_detailed_search_dto { main_id = mainID, ispush = false }, 0, int.MaxValue, ref total)); //datas.AddRange(PurchaseAdviseServices.DetailList(new dc_auto_purchase_advise_detailed_search_dto { main_id = mainID, ispush = false }, 0, int.MaxValue, ref total));
......
...@@ -30,6 +30,8 @@ namespace AutoTurnOver.Controllers ...@@ -30,6 +30,8 @@ namespace AutoTurnOver.Controllers
/// <returns></returns> /// <returns></returns>
public JsonResult ForecastSalePutinStockShort(string sku, string warehousecode) public JsonResult ForecastSalePutinStockShort(string sku, string warehousecode)
{ {
try
{
var services = new Services.ReportServices(); var services = new Services.ReportServices();
var result = services.ForecastSalePutinStockShort(sku, warehousecode); var result = services.ForecastSalePutinStockShort(sku, warehousecode);
...@@ -75,17 +77,17 @@ namespace AutoTurnOver.Controllers ...@@ -75,17 +77,17 @@ namespace AutoTurnOver.Controllers
} }
for (var i = -7; i < count; i++) for (var i = -7; i < count; i++)
{ {
var dateI = today.AddDays(i+7); var dateI = today.AddDays(i + 7);
var date_str = dateI.ToString("yyyy-MM-dd"); var date_str = dateI.ToString("yyyy-MM-dd");
var weekItem = dc_base_week_coefficient_datas.FirstOrDefault(s => s.week == (int)dateI.DayOfWeek); var weekItem = dc_base_week_coefficient_datas.FirstOrDefault(s => s.week == (int)dateI.DayOfWeek);
if (weekItem != null) if (weekItem != null)
{ {
weeks.Add(new { value = weekItem.coefficient, date = dateI.ToString("MM/dd"), formula = $" ( {weekItem.formula} )",val= $"{weekItem.coefficient}" }); weeks.Add(new { value = weekItem.coefficient, date = dateI.ToString("MM/dd"), formula = $" ( {weekItem.formula} )", val = $"{weekItem.coefficient}" });
} }
else else
{ {
weeks.Add(new { value = 1, date = dateI.ToString("MM/dd"), formula = "-",val="-" }); weeks.Add(new { value = 1, date = dateI.ToString("MM/dd"), formula = "-", val = "-" });
} }
var sales_day_configItem = sales_day_config_datas.FirstOrDefault(s => s.date_str == date_str); var sales_day_configItem = sales_day_config_datas.FirstOrDefault(s => s.date_str == date_str);
if (sales_day_configItem != null) if (sales_day_configItem != null)
...@@ -94,7 +96,7 @@ namespace AutoTurnOver.Controllers ...@@ -94,7 +96,7 @@ namespace AutoTurnOver.Controllers
} }
else else
{ {
sales_day_configs.Add(new { date = date_str, id = 0, val = 0}); sales_day_configs.Add(new { date = date_str, id = 0, val = 0 });
} }
} }
...@@ -111,7 +113,7 @@ namespace AutoTurnOver.Controllers ...@@ -111,7 +113,7 @@ namespace AutoTurnOver.Controllers
var salesList = result[0].ToObj<List<decimal>>(); var salesList = result[0].ToObj<List<decimal>>();
for (int i = 7; i < turnoverData.turnover_days + 7 - 1; i++) for (int i = 7; i < turnoverData.turnover_days + 7 - 1; i++)
{ {
salesList[i] = Math.Round( salesList[i] * weeks[i].value,0); salesList[i] = Math.Round(salesList[i] * weeks[i].value, 0);
turnoverDatecumulativeSales += salesList[i]; turnoverDatecumulativeSales += salesList[i];
} }
...@@ -156,6 +158,11 @@ namespace AutoTurnOver.Controllers ...@@ -156,6 +158,11 @@ namespace AutoTurnOver.Controllers
} }
); );
} }
catch (Exception ex)
{
return new JsonResult(new { s= ex.Message,ss = ex.StackTrace });
}
}
/// <summary> /// <summary>
/// 实时库存 /// 实时库存
......
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