From f9022b96bad0550144990710a7da634ce55dcebd Mon Sep 17 00:00:00 2001 From: fomichev Date: Thu, 29 May 2025 12:32:34 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?utf8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20?= =?utf8?q?=D0=BF=D0=BE=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80=D0=B8?= =?utf8?q?=D1=8F=D0=BC=20'=D0=B1=D1=83=D0=BA=D0=B5=D1=82',=20'=D1=81=D0=B1?= =?utf8?q?=D0=BE=D1=80=D0=BA=D0=B0',=20'=D1=81=D0=B5=D1=80=D0=B2=D0=B8?= =?utf8?q?=D1=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/AutoPlannogrammaService.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php index 148980a2..e54e3662 100644 --- a/erp24/services/AutoPlannogrammaService.php +++ b/erp24/services/AutoPlannogrammaService.php @@ -133,7 +133,7 @@ class AutoPlannogrammaService ->leftJoin('products_1c_nomenclature p1c', "p1c.id = $productJoinCondition") ->leftJoin('export_import_table ex', $storeJoinCondition) ->andWhere(['ex.entity_id' => $storeIds]) - ->andWhere(['<>', 'p1c.category', '']) + ->andWhere(['<>', 'p1c.category', ['', 'букет', 'сборка', 'сервис' ]]) ->andWhere(['>=', "$alias.date", (new \DateTime($month1 . '-01'))->format('Y-m-d')]) ->andWhere(['<=', "$alias.date", (new \DateTime($month3 . '-01'))->modify('last day of this month')->format('Y-m-d')]) ->groupBy(['ex.entity_id', 'p1c.category']), @@ -149,7 +149,7 @@ class AutoPlannogrammaService ->leftJoin('products_1c_nomenclature p1c', "p1c.id = $productJoinCondition") ->leftJoin('export_import_table ex', $storeJoinCondition) ->andWhere(['ex.entity_id' => $storeIds]) - ->andWhere(['<>', 'p1c.category', '']) + ->andWhere(['<>', 'p1c.category', ['', 'букет', 'сборка', 'сервис' ]]) ->andWhere(['>=', "$alias.date", (new \DateTime($month1 . '-01'))->format('Y-m-d')]) ->andWhere(['<=', "$alias.date", (new \DateTime($month3 . '-01'))->modify('last day of this month')->format('Y-m-d')]) ->groupBy(['ex.entity_id']), @@ -194,8 +194,6 @@ class AutoPlannogrammaService } } - - // var_dump($allComponentsProductIds); die(); $result = []; foreach ($rows as $r) { $sid = $r['store_id']; -- 2.39.5