From: Vladimir Fomichev Date: Wed, 20 Aug 2025 09:57:30 +0000 (+0300) Subject: Убираем актуальность из расчета X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f061fb77088edc23d9c475a37c64161b7a2d738c;p=erp24_rep%2Fyii-erp24%2F.git Убираем актуальность из расчета --- diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php index 76d285a3..b46e1110 100755 --- a/erp24/services/StorePlanService.php +++ b/erp24/services/StorePlanService.php @@ -418,36 +418,7 @@ class StorePlanService $productsWithHistory = []; $productsWithoutHistory = []; - $guids = array_keys($salesHistory); - $actualities = Products1cNomenclatureActuality::find() - ->where(['guid' => $guids, 'active' => 1]) - ->indexBy('guid') - ->all(); - foreach ($salesHistory as $guid => $info) { - if (!isset($actualities[$guid])) { - continue; - } - $act = $actualities[$guid]; - $actFrom = new \DateTime($act->date_from); - $actTo = $act->date_to - ? new \DateTime($act->date_to) - : (new \DateTime())->modify('+1 years'); - - $isInsideActivity = true; - foreach ($periods as $periodKey => $periodData) { - $pStart = \DateTime::createFromFormat('Y-m', $periodKey); - $pStart->modify('first day of this month')->setTime(0, 0, 0); - $pEnd = (clone $pStart)->modify('last day of this month')->setTime(23, 59, 59); - - if ($pStart < $actFrom || $pEnd > $actTo) { - $isInsideActivity = false; - break; - } - } - if (!$isInsideActivity) { - continue; - } $monthsData = $info['data']; $metaFields = [ 'store_id' => $info['store_id'],