From 464c9a72be450fb62f981fe58270dde6bbc38cbd Mon Sep 17 00:00:00 2001 From: fomichev Date: Wed, 28 May 2025 17:15:25 +0300 Subject: [PATCH] =?utf8?q?=D0=A1=D0=B1=D0=BE=D1=80=20=D0=BD=D0=B5=D0=B4?= =?utf8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80=D0=BE=D0=B4?= =?utf8?q?=D0=B0=D0=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/AutoPlannogrammaController.php | 7 ++++--- erp24/services/AutoPlannogrammaService.php | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php index 1cf387a6..49c3ad2e 100644 --- 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 78694566..2c23b248 100644 --- 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) { -- 2.39.5