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

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index d93e4bf734c42fb6b5fa4c4b9b35d5e10db6aa24..0976c1ab843aa3e6dcf24df8879fe9af4c1edec9 100644 (file)
--- 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 d7a831e9caf8f771dcc8f80ba7781d63662d7eb9..7f5fae0555135f3ec0ca5a0f83e06481c4a14616 100644 (file)
--- 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 3f9798ac2e2bd2efbc952a9245d03952d8a4cb48..960cd920245a7d150a0174ddabb031ba632047e0 100644 (file)
--- 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 4c5b798afd4fb1f757e013d070b5a1c3ee1cebd4..502fc2c0459aa9d5076f6ca0947f7054ec693616 100644 (file)
--- 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 73254c2886dab37999b2f405246aec3dae2519b8..94a02682006482815adb4373b565782ec2feb32a 100644 (file)
--- 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 468d0847e4680e6323e04aebbebd05f9bfccd295..0b4a1313fb24f19933c5093d07974cd18ec41563 100644 (file)
--- 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 da80eb5520041e263a83dbfa4393cf1455fad9d9..4cb9bce383ce13e8f8ca517623e5d085599323f5 100644 (file)
--- 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',