采购建议公式调整

AutoTurnOver/Controllers/ReportsController.cs

@@ -58,21 +58,32 @@ namespace AutoTurnOver.Controllers
             {
                 turnoverDatecumulativeSales += salesList[i];
             }
-            var turnoverDateSales = (int)result[0].ToObj<List<decimal>>()[turnoverData.turnover_days + 7 - 1];
+
+
+            // 累计预计到货
+            decimal turnoverDatepurchase = 0;
+            var purchaseList = result[1].ToObj<List<decimal>>();
+            for (int i = 7; i < turnoverData.turnover_days + 7; i++)
+            {
+                turnoverDatepurchase += purchaseList[i];
+            }
+
+            // 当日预测销量
+             var turnoverDateSales =(int)result[0].ToObj<List<decimal>>()[turnoverData.turnover_days + 7];
             var buyFormula = new
             {
                 turnoverDateStr = turnoverDate.ToString("yyyy-MM-dd"), // 取值日期
                 turnoverDateSales = turnoverDateSales, // 当日预测销量
-                turnoverDateStock = (int)result[2].ToObj<List<decimal>>()[turnoverData.turnover_days + 7 -1],   // 当日预测库存,
+                turnoverDateStock = (int)result[2].ToObj<List<decimal>>()[turnoverData.turnover_days + 7],   // 当日预测库存,
                 turnoverDatecumulativeSales = (int)turnoverDatecumulativeSales, // 累计销量
                 nowStr = DateTime.Now.ToString("yyyy-MM-dd"), // 今天的日期
                 nowShortage = (int)result[3].ToObj<List<decimal>>()[7], // 今天的实际缺货
                 cumulativeShortageDate = turnoverDate.AddDays(-1).ToString("yyyy-MM-dd"),// 一直到周转期前一天的日期
                 cumulativeShortage = (int)result[3].ToObj<List<decimal>>()[turnoverData.turnover_days + 7 - 1],  // 一直到周转期前一天的累计缺货
                 average_overdue = Math.Max(0, turnoverData.average_overdue),
-                nowDateStock = (int)result[2].ToObj<List<decimal>>()[7]   // 今天的预测库存
+                nowDateStock = (int)result[2].ToObj<List<decimal>>()[7],   // 今天的预测库存
+                turnoverDatepurchase = turnoverDatepurchase // 累计预计到货
             };
-            turnoverData.quantity_purchase = turnoverDateSales;
             return new JsonResult(new
             {
                 data = result,