Вывод доп данных для подкатегории

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index 13a38e8535bf2f8097b4a734b8aa6ca4549e7a6a..babc6d2bdf0b8f787cb6ccbb633ba02166b85297 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -325,7 +325,12 @@ class AutoPlannogrammaController extends BaseController
                 unset($row);
                 $monthSubcategoryGoal = $service->getMonthSubcategoryGoal($monthSubcategoryShare, $monthCategoryGoal);
             }
+           // var_dump($monthSubcategoryShare); die();
+            foreach ($monthSubcategoryShare as $subcat) {
+                    $monthCategoryShareResult[$subcat['store_id']][$subcat['category']][$subcat['subcategory']]['total_sum'] = $subcat['total_sum'];
+                    $monthCategoryShareResult[$subcat['store_id']][$subcat['category']][$subcat['subcategory']]['percent_of_month'] = $subcat['percent_of_month'];
 
+            }
             $monthSpeciesShare = $service->getMonthSpeciesShareOrWriteOffWeighted($datePlan, $datePlan, $filters, null, $filters['type']);
             $monthSpeciesGoal = $service->getMonthSpeciesGoalDirty($monthSpeciesShare, $monthSubcategoryGoal);
             if ($filters['type'] === 'writeOffs') {

diff --git a/erp24/views/auto-plannogramma/control-species.php b/erp24/views/auto-plannogramma/control-species.php
index 50acfe622ea64aa47e8cd0117e9fb37ca204b87d..e19017cf2277a0e0b47b2730aaa4955b4b986c3c 100644 (file)
--- a/erp24/views/auto-plannogramma/control-species.php
+++ b/erp24/views/auto-plannogramma/control-species.php
@@ -97,7 +97,11 @@ use yii_app\records\Products1c;
             <thead>
             <tr>
                 <th>Категория</th>
+                <th>Категория сумма</th>
+                <th>Категория доля</th>
                 <th>Подкатегория</th>
+                <th>Подкатегория сумма</th>
+                <th>Подкатегория доля</th>
                 <th>Вид</th>
                 <th>Неделя</th>
                 <th>Доля (%)</th>
@@ -108,8 +112,12 @@ use yii_app\records\Products1c;
             <tbody>
             <?php foreach ($weeksData as $r): ?>
                 <tr>
-                    <td><?= Html::encode($r['category']) ?>  <?=  $monthCategoryShare[$model->storeId][$r['category']]['total_sum_cat'] ?>  <?=  Yii::$app->formatter->asPercent($monthCategoryShare[$model->storeId][$r['category']]['share_of_total'], 2) ?></td>
+                    <td><?= Html::encode($r['category']) ?>  </td>
+                    <td><?=  $monthCategoryShare[$model->storeId][$r['category']]['total_sum_cat'] ?>
+                    <td><?=  Yii::$app->formatter->asPercent($monthCategoryShare[$model->storeId][$r['category']]['share_of_total'], 2) ?></td>
                     <td><?= Html::encode($r['subcategory']) ?></td>
+                    <td><?=  $monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']]['total_sum'] ?>
+                    <td><?=  Yii::$app->formatter->asPercent($monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']]['percent_of_month'], 2) ?></td>
                     <td><?= Html::encode($r['species']) ?></td>
                     <td><?= $r['week'] ?>  неделя - начало <?= \yii_app\services\AutoPlannogrammaService::getIsoWeekStart((int)date('Y'), (int)$r['week']) ?></td>
                     <td>