From 75913d3fa027c9a4f0fc47546fbf8f3cba4744ac Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 13 May 2025 15:14:43 +0300
Subject: [PATCH] =?utf8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B4=D0=BE?=
 =?utf8?q?=D0=BF=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BB?=
 =?utf8?q?=D1=8F=20=D0=B2=D0=B8=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/AutoPlannogrammaController.php  | 4 ++++
 erp24/views/auto-plannogramma/control-species.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index babc6d2b..5a640043 100644
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -363,7 +363,11 @@ class AutoPlannogrammaController extends BaseController
 
                 $monthSpeciesGoal = $service->getMonthSpeciesGoalDirty($monthSpeciesShare, $monthSubcategoryGoal);
             }
+            foreach ($monthSpeciesShare as $species) {
+                $monthCategoryShareResult[$species['store_id']][$species['category']][$species['subcategory']][$species['species']]['total_sum'] = $species['total_sum'];
+                $monthCategoryShareResult[$species['store_id']][$species['category']][$species['subcategory']][$species['species']]['percent_of_month'] = $species['percent_of_month'];
 
+            }
 
 
 
diff --git a/erp24/views/auto-plannogramma/control-species.php b/erp24/views/auto-plannogramma/control-species.php
index e19017cf..abd6f86b 100644
--- a/erp24/views/auto-plannogramma/control-species.php
+++ b/erp24/views/auto-plannogramma/control-species.php
@@ -103,6 +103,8 @@ use yii_app\records\Products1c;
                 <th>Подкатегория сумма</th>
                 <th>Подкатегория доля</th>
                 <th>Вид</th>
+                <th>Вид сумма</th>
+                <th>Вид доля</th>
                 <th>Неделя</th>
                 <th>Доля (%)</th>
                 <th>Цель месяца</th>
@@ -119,6 +121,8 @@ use yii_app\records\Products1c;
                     <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><?=  $monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']][$r['species']]['total_sum'] ?>
+                    <td><?=  Yii::$app->formatter->asPercent($monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']][$r['species']]['percent_of_month'], 2) ?></td>
                     <td><?= $r['week'] ?>  неделя - начало <?= \yii_app\services\AutoPlannogrammaService::getIsoWeekStart((int)date('Y'), (int)$r['week']) ?></td>
                     <td>
                         <?php if ($r['percent'] === null): ?>
-- 
2.39.5