From: marina <m.zozirova@gmail.com>
Date: Wed, 7 May 2025 07:27:44 +0000 (+0300)
Subject: ERP-413 Обработка ОС Планограмма (месяц)
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0058f8c8bd7e6a5e51879b24dd1e374b9c4400b0;p=erp24_rep%2Fyii-erp24%2F.git

ERP-413 Обработка ОС Планограмма (месяц)
---

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index d93e4bf7..0976c1ab 100644
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -221,16 +221,21 @@ class AutoPlannogrammaController extends BaseController
             'allModels' => [],
             'pagination' => ['pageSize' => 100],
         ]);
-
         if (!empty($filters['plan_date'])) {
-            $service = new AutoPlannogrammaService();
+            $planDateParts = explode('-', $filters['plan_date']);
+            if (count($planDateParts) === 2) {
+                [$month, $year] = $planDateParts;
+                $filters['plan_date'] = "$year-$month-01";
+            }
 
+            $service = new AutoPlannogrammaService();
             $data = $service->getMonthCategoryShareOrWriteOff($filters['plan_date'], $filters, null, $filters['type']);
+
             $flatData = [];
             foreach ($data as $storeId => $categories) {
                 foreach ($categories as $row) {
                     $flatData[] = [
-                        'store_id' => (string)$storeId, // фильтрация по ID, а не имени
+                        'store_id' => (string)$storeId,
                         'category' => $row['category'] ?? null,
                         'total_sum' => $row['total_sum'] ?? null,
                         'share_of_total' => $row['share_of_total'] ?? null,
@@ -280,6 +285,11 @@ class AutoPlannogrammaController extends BaseController
 
 
         if (!empty($filters['plan_date'])) {
+            $planDateParts = explode('-', $filters['plan_date']);
+            if (count($planDateParts) === 2) {
+                [$month, $year] = $planDateParts;
+                $filters['plan_date'] = "$year-$month-01";
+            }
             $service = new AutoPlannogrammaService();
 
             $monthCategoryShare = $service->getMonthCategoryShareOrWriteOff($filters['plan_date'], $filters);
@@ -329,6 +339,11 @@ class AutoPlannogrammaController extends BaseController
 
 
         if (!empty($filters['plan_date'])) {
+            $planDateParts = explode('-', $filters['plan_date']);
+            if (count($planDateParts) === 2) {
+                [$month, $year] = $planDateParts;
+                $filters['plan_date'] = "$year-$month-01";
+            }
             $service = new AutoPlannogrammaService();
 
             $data = $service->getMonthSubcategoryShareOrWriteOff($filters['plan_date'], $filters, null, $filters['type']);
@@ -375,7 +390,14 @@ class AutoPlannogrammaController extends BaseController
 
 
         if (!empty($filters['plan_date'])) {
+            $planDateParts = explode('-', $filters['plan_date']);
+            if (count($planDateParts) === 2) {
+                [$month, $year] = $planDateParts;
+                $filters['plan_date'] = "$year-$month-01";
+            }
+
             $service = new AutoPlannogrammaService();
+
             $monthCategoryShare = $service->getMonthCategoryShareOrWriteOff(
                 date('Y-m-d', strtotime($filters['plan_date'] . ' -12 months')),
                 $filters
@@ -430,8 +452,14 @@ class AutoPlannogrammaController extends BaseController
         ]);
 
 
-        if (!empty($filters['plan_date'])) {
+        if (!empty($filters['plan_date'])) { $planDateParts = explode('-', $filters['plan_date']);
+            if (count($planDateParts) === 2) {
+                [$month, $year] = $planDateParts;
+                $filters['plan_date'] = "$year-$month-01";
+            }
+
             $service = new AutoPlannogrammaService();
+
             $data = $service->getMonthSpeciesShareOrWriteOff(
                 date('Y-m-d', strtotime($filters['plan_date'] . ' -3 months')),
                 $filters,
@@ -484,7 +512,14 @@ class AutoPlannogrammaController extends BaseController
 
 
         if (!empty($filters['plan_date'])) {
+            $planDateParts = explode('-', $filters['plan_date']);
+            if (count($planDateParts) === 2) {
+                [$month, $year] = $planDateParts;
+                $filters['plan_date'] = "$year-$month-01";
+            }
+
             $service = new AutoPlannogrammaService();
+            
             $monthCategoryShare = $service->getMonthCategoryShareOrWriteOff(
                 date('Y-m-d', strtotime($filters['plan_date'] . ' -12 months')),
                 $filters
diff --git a/erp24/views/auto-plannogramma/1.php b/erp24/views/auto-plannogramma/1.php
index d7a831e9..7f5fae05 100644
--- a/erp24/views/auto-plannogramma/1.php
+++ b/erp24/views/auto-plannogramma/1.php
@@ -36,7 +36,7 @@
             <?= $form->field(new \yii\base\DynamicModel(['plan_date' => $filters['plan_date'] ?? '']), 'plan_date')->widget(DatePicker::class, [
                 'pluginOptions' => [
                     'autoclose' => true,
-                    'format' => 'dd-mm-yyyy',
+                    'format' => 'mm-yyyy',
                 ],
                 'options' => [
                     'class' => 'form-control',
diff --git a/erp24/views/auto-plannogramma/2.php b/erp24/views/auto-plannogramma/2.php
index 3f9798ac..960cd920 100644
--- a/erp24/views/auto-plannogramma/2.php
+++ b/erp24/views/auto-plannogramma/2.php
@@ -39,7 +39,7 @@
             <?= $form->field(new \yii\base\DynamicModel(['plan_date' => $filters['plan_date'] ?? '']), 'plan_date')->widget(DatePicker::class, [
                 'pluginOptions' => [
                     'autoclose' => true,
-                    'format' => 'dd-mm-yyyy',
+                    'format' => 'mm-yyyy',
                 ],
                 'options' => [
                     'class' => 'form-control',
diff --git a/erp24/views/auto-plannogramma/3.php b/erp24/views/auto-plannogramma/3.php
index 4c5b798a..502fc2c0 100644
--- a/erp24/views/auto-plannogramma/3.php
+++ b/erp24/views/auto-plannogramma/3.php
@@ -49,7 +49,7 @@
             <?= $form->field(new \yii\base\DynamicModel(['plan_date' => $filters['plan_date'] ?? '']), 'plan_date')->widget(DatePicker::class, [
                 'pluginOptions' => [
                     'autoclose' => true,
-                    'format' => 'dd-mm-yyyy',
+                    'format' => 'mm-yyyy',
                 ],
                 'options' => [
                     'class' => 'form-control',
diff --git a/erp24/views/auto-plannogramma/4.php b/erp24/views/auto-plannogramma/4.php
index 73254c28..94a02682 100644
--- a/erp24/views/auto-plannogramma/4.php
+++ b/erp24/views/auto-plannogramma/4.php
@@ -51,7 +51,7 @@
             <?= $form->field(new \yii\base\DynamicModel(['plan_date' => $filters['plan_date'] ?? '']), 'plan_date')->widget(DatePicker::class, [
                 'pluginOptions' => [
                     'autoclose' => true,
-                    'format' => 'dd-mm-yyyy',
+                    'format' => 'mm-yyyy',
                 ],
                 'options' => [
                     'class' => 'form-control',
diff --git a/erp24/views/auto-plannogramma/5.php b/erp24/views/auto-plannogramma/5.php
index 468d0847..0b4a1313 100644
--- a/erp24/views/auto-plannogramma/5.php
+++ b/erp24/views/auto-plannogramma/5.php
@@ -62,7 +62,7 @@
             <?= $form->field(new \yii\base\DynamicModel(['plan_date' => $filters['plan_date'] ?? '']), 'plan_date')->widget(DatePicker::class, [
                 'pluginOptions' => [
                     'autoclose' => true,
-                    'format' => 'dd-mm-yyyy',
+                    'format' => 'mm-yyyy',
                 ],
                 'options' => [
                     'class' => 'form-control',
diff --git a/erp24/views/auto-plannogramma/6.php b/erp24/views/auto-plannogramma/6.php
index da80eb55..4cb9bce3 100644
--- a/erp24/views/auto-plannogramma/6.php
+++ b/erp24/views/auto-plannogramma/6.php
@@ -62,7 +62,7 @@
             <?= $form->field(new \yii\base\DynamicModel(['plan_date' => $filters['plan_date'] ?? '']), 'plan_date')->widget(DatePicker::class, [
                 'pluginOptions' => [
                     'autoclose' => true,
-                    'format' => 'dd-mm-yyyy',
+                    'format' => 'mm-yyyy',
                 ],
                 'options' => [
                     'class' => 'form-control',