Правки по товарам без истории

diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php
index 8a9dd24d7b094af28f8a76574a3d84261d77f81d..a84b3ef5b79cb78f09ac7031ee7e8830b3f98dff 100644 (file)
--- 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 c732738d9348302a657471a9e6f262b47efbd175..20d954b58f3fda719bd142b025d7f4c842758223 100755 (executable)
--- 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])