Commit 9f01620b by 泽锋 李

fix

parent 1ebde957
...@@ -20,7 +20,7 @@ namespace AutoGeneratePurchaseAdvise ...@@ -20,7 +20,7 @@ namespace AutoGeneratePurchaseAdvise
//purchase_advise.ReplaceLogistics(DateTime.Now); //purchase_advise.ReplaceLogistics(DateTime.Now);
//purchase_advise.WaitReplaceLogisticsTask(); //purchase_advise.WaitReplaceLogisticsTask();
//PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("2020-11-27 14:50:00"))); //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("2020-11-27 19:40:00")));
//PurchaseAdviseServices.AutoPushBuySys(6); //PurchaseAdviseServices.AutoPushBuySys(6);
//PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00"))); //PurchaseAdviseServices.Generate(DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd 12:00:00")));
} }
......
...@@ -81,11 +81,11 @@ namespace AutoTurnOver.Controllers ...@@ -81,11 +81,11 @@ namespace AutoTurnOver.Controllers
if (weekItem != null) if (weekItem != null)
{ {
weeks.Add(new { 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 { 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)
...@@ -99,7 +99,6 @@ namespace AutoTurnOver.Controllers ...@@ -99,7 +99,6 @@ namespace AutoTurnOver.Controllers
} }
var names = new List<string>() { "销量", "计算公式", "计算规则", "预计入库", "可用库存", "预计缺货数量", "特殊销量", "市场因素", "建议下单数量", "人工下单数量" }; var names = new List<string>() { "销量", "计算公式", "计算规则", "预计入库", "可用库存", "预计缺货数量", "特殊销量", "市场因素", "建议下单数量", "人工下单数量" };
var turnoverData = new Services.SkuAutoTurnServices().GetModel(sku, warehousecode); var turnoverData = new Services.SkuAutoTurnServices().GetModel(sku, warehousecode);
var saleVolumeData = new Services.SaleVolumeServices().GetBySkuWarehouseCode(sku, warehousecode); var saleVolumeData = new Services.SaleVolumeServices().GetBySkuWarehouseCode(sku, warehousecode);
...@@ -112,9 +111,11 @@ namespace AutoTurnOver.Controllers ...@@ -112,9 +111,11 @@ 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);
turnoverDatecumulativeSales += salesList[i]; turnoverDatecumulativeSales += salesList[i];
} }
result[0] = salesList.ToJson();
// 累计预计到货 // 累计预计到货
decimal turnoverDatepurchase = 0; decimal turnoverDatepurchase = 0;
......
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