From 2f149fa33bc2b016f9849438ad8e2aeda0cfefe2 Mon Sep 17 00:00:00 2001 From: fomichev Date: Fri, 30 May 2025 14:43:13 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=B0=D0=BC=20=D0=B1?= =?utf8?q?=D0=B5=D0=B7=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/AutoPlannogrammaService.php | 2 +- erp24/services/StorePlanService.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php index 8a9dd24d..a84b3ef5 100644 --- a/erp24/services/AutoPlannogrammaService.php +++ b/erp24/services/AutoPlannogrammaService.php @@ -928,7 +928,7 @@ class AutoPlannogrammaService { $region = CityStoreParams::find() ->where(['store_id' => $storeId]) - ->one()->address_region; + ->one()->address_region ?? null; if (!$region) { $cityId = CityStore::find()->select('city_id')->where(['id' => $storeId])->scalar(); diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php index c732738d..20d954b5 100755 --- a/erp24/services/StorePlanService.php +++ b/erp24/services/StorePlanService.php @@ -345,9 +345,12 @@ class StorePlanService ]) ->innerJoin('sales_products sp', 's.id = sp.check_id') ->innerJoin('products_1c_nomenclature p1c', 'p1c.id = sp.product_id') + ->leftJoin('products_1c p1', 'p1.id = sp.product_id') ->where(['s.store_id' => $storeId]) ->andWhere(['between', 's.date', $dateStart, $dateEnd]) ->andWhere(['order_id' => ['', '0']]) + ->andWhere(['p1.components' => '']) + ->andWhere(['not in', 'p1c.category', ['', 'букет', 'сборка', 'сервис']]) ->andFilterWhere(['p1c.category' => $category]) ->andFilterWhere(['p1c.subcategory' => $subcategory]) ->andFilterWhere(['p1c.species' => $species]) -- 2.39.5