Сбор недельных продаж

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index 1cf387a602a64b74ea5266e895039f87e0f730ef..49c3ad2e41a452570871c7ce87d10833f33ef49e 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -1042,11 +1042,12 @@ class AutoPlannogrammaController extends BaseController
            // var_dump( $filters['plan_date']); die();
             $service = new AutoPlannogrammaService();
 
-            $weeklySales = $service->getWeeklySpeciesDataForMonth($filters['plan_date'], $filters);
+           // $weeklySales = $service->getWeeklySpeciesDataForMonth($filters['plan_date'], $filters);
+            $weeksShareResult = $service->getHistoricalWeeklySpeciesShare($filters['plan_date'], $filters);
+           // $weeksData = $service->calculateWeeklySpeciesGoals($weeksShareResult['weeksData'], $monthSpeciesGoals) ;
 
 
-
-            var_dump($weeklySales); die();
+            var_dump($weeksShareResult); die();
 
 
 

diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php
index 78694566d1e1862360884e433d153986feac7461..2c23b248ec748feee43d91f052f37ee5085a3e2c 100644 (file)
--- a/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@ -571,7 +571,7 @@ class AutoPlannogrammaService
         ?array $productFilter = null,
         string $type = 'sales'
     ): array {
-        [$yearStr, $monthStr, $_ ] = explode('-', $monthYear);
+        [$yearStr, $monthStr ] = explode('-', $monthYear);
         $month = (int)$monthStr;
         $year  = (int)$yearStr;
 
@@ -690,13 +690,14 @@ class AutoPlannogrammaService
         ?array $productFilter = null,
         string $type = 'sales'
     ): array {
-        [$monthStr, $yearStr] = explode('-', $monthYear);
+        [$yearStr, $monthStr, $_ ] = explode('-', $monthYear);
         $month = (int)$monthStr;
         $year  = (int)$yearStr;
 
         $historical = [];
         for ($yr = $year - 2; $yr < $year; $yr++) {
-            $mYear = sprintf('%02d-%d', $month, $yr);
+            $mYear = sprintf('%04d-%02d',$yr, $month);
+
             $weeklyData = $this->getWeeklySpeciesDataForMonth(
                 $mYear, $filters, $productFilter, $type
             );
@@ -720,8 +721,8 @@ class AutoPlannogrammaService
 
         $dateFrom = sprintf('%04d-%02d-01 00:00:00', $year, $month);
         $dateTo   = date('Y-m-d H:i:s', strtotime("$dateFrom +1 month -1 second"));
-        $monthWeighted = $this->getMonthSpeciesShareOrWriteOffWeighted(
-            $dateFrom, $dateTo, $filters, $productFilter, $type
+        $monthWeighted = $this->getMonthSpeciesShareOrWriteOff(
+            $dateFrom, $filters, $type
         );
         $monthMap = [];
         foreach ($monthWeighted as $m) {