From 53ce4109ba5f6f526d9b9aa2a5b8b80c0791dc89 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 13 May 2025 15:25:26 +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=D1=86=D0=B5=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../AutoPlannogrammaController.php            |  7 +++
 .../auto-plannogramma/control-species.php     | 56 +++----------------
 2 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index 5a640043..de94a9ff 100644
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -290,6 +290,10 @@ class AutoPlannogrammaController extends BaseController
                     $monthCategoryShareResult[$sid][$cat['category']]['share_of_total'] = $cat['share_of_total'];
                 }
 
+            }
+            foreach ($monthCategoryGoal as $cats) {
+                    $monthCategoryShareResult[$cats['store_id']][$cats['category']]['goal'] = $cats['goal'];
+
             }
             //var_dump($monthCategoryShareResult); die();
             $monthSubcategoryShare = $service->getMonthSubcategoryShareOrWriteOffWeighted($datePlan, $filters, null, $filters['type']);
@@ -329,6 +333,9 @@ class AutoPlannogrammaController extends BaseController
             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'];
+            }
+            foreach ($monthSubcategoryGoal as $cats) {
+                $monthCategoryShareResult[$cats['store_id']][$cats['category']][$cats['subcategory']]['goal'] = $cats['goal'];
 
             }
             $monthSpeciesShare = $service->getMonthSpeciesShareOrWriteOffWeighted($datePlan, $datePlan, $filters, null, $filters['type']);
diff --git a/erp24/views/auto-plannogramma/control-species.php b/erp24/views/auto-plannogramma/control-species.php
index abd6f86b..5adabfc4 100644
--- a/erp24/views/auto-plannogramma/control-species.php
+++ b/erp24/views/auto-plannogramma/control-species.php
@@ -46,51 +46,7 @@ use yii_app\records\Products1c;
 
     <?php ActiveForm::end(); ?>
 
-    <?php if (!empty($totals)): ?>
-    <h2>Итоги по магазину</h2>
-    <table class="table table-bordered">
-        <thead>
-        <tr>
-            <th>Магазин</th>
-            <th>Итого сумма</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($totals as $storeId => $sum): ?>
-        <tr>
-            <td><?= Html::encode($storeList[$storeId] ?? $storeId) ?></td>
-            <td><?= Yii::$app->formatter->asDecimal($sum, 2) ?></td>
-        </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php endif; ?>
 
-    <?php if (!empty($result)): ?>
-    <h2>Детализация по видам</h2>
-    <table class="table table-striped table-bordered">
-        <thead>
-        <tr>
-            <th>Категория</th>
-            <th>Подкатегория</th>
-            <th>Вид товара</th>
-            <th>Сумма</th>
-            <th>Доля</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($result as $row): ?>
-        <tr>
-            <td><?= Html::encode($row['category']) ?> <?=  $monthCategoryShare[$row['category']]['total_sum_cat'] ?>  <?=  Yii::$app->formatter->asPercent($monthCategoryShare[$row['category']]['share_of_total'], 2) ?></td>
-            <td><?= Html::encode($row['subcategory']) ?></td>
-            <td><?= Html::encode($row['species']) ?></td>
-            <td><?= Yii::$app->formatter->asDecimal($row['total_sum'], 2) ?></td>
-            <td><?= Yii::$app->formatter->asPercent($row['percent_of_month'], 2) ?></td>
-        </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php endif; ?>
     <?php if (!empty($weeksData)): ?>
         <h2>Результаты по неделям</h2>
         <table class="table table-striped table-bordered">
@@ -99,15 +55,18 @@ use yii_app\records\Products1c;
                 <th>Категория</th>
                 <th>Категория сумма</th>
                 <th>Категория доля</th>
+                <th>Категория цель</th>
                 <th>Подкатегория</th>
                 <th>Подкатегория сумма</th>
                 <th>Подкатегория доля</th>
+                <th>Подкатегория цель</th>
                 <th>Вид</th>
                 <th>Вид сумма</th>
                 <th>Вид доля</th>
+                <th>Вид Цель месяца</th>
                 <th>Неделя</th>
-                <th>Доля (%)</th>
-                <th>Цель месяца</th>
+                <th>Доля недели (%)</th>
+
                 <th>Цель недели</th>
             </tr>
             </thead>
@@ -117,12 +76,15 @@ use yii_app\records\Products1c;
                     <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><?=  $monthCategoryShare[$model->storeId][$r['category']]['goal'] ?>
                     <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><?=  $monthCategoryShare[$model->storeId][$r['category']][$r['subcategory']]['goal'] ?>
                     <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['monthly_goal'] ?> </td>
                     <td><?= $r['week'] ?>  неделя - начало <?= \yii_app\services\AutoPlannogrammaService::getIsoWeekStart((int)date('Y'), (int)$r['week']) ?></td>
                     <td>
                         <?php if ($r['percent'] === null): ?>
@@ -131,7 +93,7 @@ use yii_app\records\Products1c;
                             <?= Yii::$app->formatter->asPercent($r['percent'], 1) ?>
                         <?php endif; ?>
                     </td>
-                    <td><?= $r['monthly_goal'] ?> </td>
+
                     <td><?= $r['weekly_goal'] ?>  </td>
                 </tr>
             <?php endforeach; ?>
-- 
2.39.5