ERP-360 Сборка страницы автопм

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index bc1057d298e3e68796a3fdcd75252fa6ba7aca96..505369a630f376cac75aff41003c5c12cd728a39 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -156,11 +156,15 @@ class AutoPlannogrammaController extends BaseController
             foreach ($productData['values'] as &$value) {
                 $storeId = $value['store_id'];
                 $value['title'] = [];
+
                 if (isset($forecast[$storeId][$productId])) {
                     $forecastData = $forecast[$storeId][$productId];
+                    $quantity = $value['quantity'];
+
                     foreach ($forecastData as $type => $groups) {
-                        foreach ($groups as $group => $amount) {
-                            $value['title'][$type][$group] = $amount;
+                        if (isset($groups['share'])) {
+                            $calculated = round($quantity * $groups['share'], 2);
+                            $value['title'][$type] = $calculated;
                         }
                     }
                 }
@@ -230,7 +234,7 @@ class AutoPlannogrammaController extends BaseController
                 ->select('store_id')
                 ->where(['category' => 3, 'active' => 1, 'value_int' => $filters['territorial_manager']])
                 ->column();
-            $query->andWhere(['in', 'a.store_id', $territorialManagerStoreIds ?: [-1]]);
+            $query->andWhere(['in', 'p.store_id', $territorialManagerStoreIds ?: [-1]]);
         }
 
         if (!empty($filters['bush_chef_florist'])) {
@@ -238,9 +242,10 @@ class AutoPlannogrammaController extends BaseController
                 ->select('store_id')
                 ->where(['category' => 2, 'active' => 1, 'value_int' => $filters['bush_chef_florist']])
                 ->column();
-            $query->andWhere(['in', 'a.store_id', $bushChefFloristStoreIds ?: [-1]]);
+            $query->andWhere(['in', 'p.store_id', $bushChefFloristStoreIds ?: [-1]]);
         }
 
+
         return array_values($query->column());
     }
 

diff --git a/erp24/views/auto-plannogramma/index.php b/erp24/views/auto-plannogramma/index.php
index 0fc108ff3f3be9a0fc1730b6fc17496dff394c81..c652830d6520b9ca887caf50ada9ed22ae10cf80 100644 (file)
--- a/erp24/views/auto-plannogramma/index.php
+++ b/erp24/views/auto-plannogramma/index.php
@@ -186,7 +186,7 @@ $this->registerJsFile('/js/autoplannogramma/autoplannogramma.js', ['position' =>
                     <?= Html::label("КШФ:", null, ['class' => 'label-kshf']) ?><br>
 
                     <div class="buttons d-flex justify-content-end">
-                        <?= Html::a('Auto', '#', ['class' => 'btn btn-success ms-1 btn-auto']) ?>
+                        <?= Html::a('Auto', Url::to(['auto-plannogramma/week-sales-species-excel']), ['class' => 'btn btn-success ms-1 btn-auto']) ?>
                         <?= Html::a('Corrected', '#', ['class' => 'btn btn-success ms-1 btn-corrected']) ?>
                     </div>
                 </th>