Вывод доп данных по неделям

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index de94a9ff1d7ac2073dd779ee204de1951cbfcab8..3d8f9b77d402d985493b132fdf112e5dd0ce8bd7 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -375,6 +375,10 @@ class AutoPlannogrammaController extends BaseController
                 $monthCategoryShareResult[$species['store_id']][$species['category']][$species['subcategory']][$species['species']]['percent_of_month'] = $species['percent_of_month'];
 
             }
+            foreach ($weeksShareResult['weeksData'] as $row) {
+                $monthCategoryShareResult[$row['store_id']][$row['category']][$row['subcategory']][$row['species']][$row['week']]['sumWeek'] = $row['sumWeek'];
+
+            }
 
 
 

diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php
index 310deaa045ba1a5d4fa1494b6ccbdf6601f9f577..64cb910a6fe8a4435e5268b736789155db9b4c82 100644 (file)
--- a/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@ -1177,6 +1177,7 @@ var_dump($totals); die();
                     'category'    => $cat,
                     'subcategory' => $sub,
                     'species'     => $spec,
+                    'sumWeek'    => $sumWeek,
                     'percent'     => $percent,
                 ];
             }

diff --git a/erp24/views/auto-plannogramma/control-species.php b/erp24/views/auto-plannogramma/control-species.php
index 5adabfc46a1eb1331e4683d7f0c5ff429d68411e..0ce69abd5fd0814c422594e8326329c6cd75c8f2 100644 (file)
--- a/erp24/views/auto-plannogramma/control-species.php
+++ b/erp24/views/auto-plannogramma/control-species.php
@@ -65,6 +65,7 @@ use yii_app\records\Products1c;
                 <th>Вид доля</th>
                 <th>Вид Цель месяца</th>
                 <th>Неделя</th>
+                <th>Сумма недели</th>
                 <th>Доля недели (%)</th>
 
                 <th>Цель недели</th>
@@ -86,6 +87,7 @@ use yii_app\records\Products1c;
                     <td><?=  Yii::$app->formatter->asPercent($monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']][$r['species']]['percent_of_month'], 2) ?></td>
                     <td><?= $r['monthly_goal'] ?> </td>
                     <td><?= $r['week'] ?>  неделя - начало <?= \yii_app\services\AutoPlannogrammaService::getIsoWeekStart((int)date('Y'), (int)$r['week']) ?></td>
+                    <td><?= $monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']][$r['species']][$r['week']]['sumWeek'] ?>  </td>
                     <td>
                         <?php if ($r['percent'] === null): ?>
                             &mdash;