From: Vladimir Fomichev Date: Fri, 22 Aug 2025 09:54:56 +0000 (+0300) Subject: Рефакторинг X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=7dc9f3e3c5a1c475070cc960a1ed89dac6d40ae0;p=erp24_rep%2Fyii-erp24%2F.git Рефакторинг --- diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php index a84a2ae5..84aa8de5 100644 --- a/erp24/services/AutoPlannogrammaService.php +++ b/erp24/services/AutoPlannogrammaService.php @@ -3166,15 +3166,15 @@ private function buildCategoryGoals(array $rawGoals, bool $subtractMatrix, int $ ); $date = $year . '-' . str_pad($month, 2, '0', STR_PAD_LEFT) . '-01'; - $df = (new \DateTime($date)) + $dateFrom = (new \DateTime($date)) ->setTime(0, 0, 0)->format('Y-m-d H:i:s'); - $dt = (new \DateTime($date)) + $dateTo = (new \DateTime($date)) ->modify('last day of this month')->setTime(23, 59, 59) ->format('Y-m-d H:i:s'); $actualProducts = Products1cNomenclatureActuality::find() ->select(['guid']) - ->where(['<=', 'date_from', $df]) - ->andWhere(['>=', 'date_to', $dt]) + ->where(['<=', 'date_from', $dateFrom]) + ->andWhere(['>=', 'date_to', $dateTo]) ->asArray() ->column();