From e75300ffa1d516de2774d283591bda696d227f79 Mon Sep 17 00:00:00 2001 From: fomichev Date: Wed, 28 May 2025 15:08:46 +0300 Subject: [PATCH] =?utf8?q?=D0=9E=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20var?= =?utf8?q?=5Fdump?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/AutoPlannogrammaService.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php index 1a941338..d077f97e 100644 --- a/erp24/services/AutoPlannogrammaService.php +++ b/erp24/services/AutoPlannogrammaService.php @@ -889,7 +889,7 @@ class AutoPlannogrammaService $dateFrom = strtotime(sprintf('%04d-%02d-01 00:00:00', $year, $month)); $dateTo = strtotime('+1 month -1 second', $dateFrom); - //var_dump($monthYear); die(); + $stores = $this->getVisibleStores(); $storeIds = array_map(fn($s)=>$s->id, $stores); if (!empty($filters['store_id'])) { @@ -924,7 +924,7 @@ class AutoPlannogrammaService } $result = []; - //var_dump($weekRanges, $dateFrom); die(); + foreach ($weekRanges as $range) { $exprWeek = new Expression((string)$range['index']); $query = (new Query())->select([ @@ -977,7 +977,6 @@ class AutoPlannogrammaService 'sum' => (float)$row['total_sum'], ]; } - // var_dump($result, $range['start'], $range['end']); die(); } return $result; @@ -1013,7 +1012,7 @@ class AutoPlannogrammaService $weeklyData = $this->getWeeklySpeciesDataForMonth( $mYear, $filters, $productFilter, $type ); - // var_dump($weeklyData, $mYear); die(); + foreach ($weeklyData as $row) { $week = $row['week']; $sid = $row['store_id']; @@ -1030,7 +1029,7 @@ class AutoPlannogrammaService ($historical[$week][$sid][$cat][$sub][$spec] ?? 0) + $sumWeek; } } - //var_dump($historical); die(); + $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( @@ -1212,7 +1211,6 @@ class AutoPlannogrammaService ->asArray() ->all(); - //var_dump($products); die(); foreach ($priceRecords as $id => $record) { if ($goal == 0 || (int)$record['price'] == 0) { $forecast = 0; @@ -1237,6 +1235,8 @@ class AutoPlannogrammaService } + // альтернативные методы расчета списаний + public function calculateFullGoalChainWeighted(array $filters): array { $datePlan = $filters['plan_date']; @@ -1311,8 +1311,7 @@ class AutoPlannogrammaService $monthSpeciesGoal = $this->getMonthSpeciesGoalDirty($monthSpeciesShare, $monthSubcategoryGoal); } - // var_dump($monthSpeciesGoal); - // die(); + $filtered = array_filter($monthSpeciesGoal, function ($row) use ($filters) { foreach ($filters as $key => $value) { if ($value === null || $value === '') { -- 2.39.5