Убираем сборку и букеты

diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php
index 2cc797a350c6d27fa303863f013ddcce3679aed9..7a5f7b5ce293fae241377620a12ecd9986ece58f 100644 (file)
--- a/erp24/controllers/CategoryPlanController.php
+++ b/erp24/controllers/CategoryPlanController.php
@@ -73,7 +73,7 @@ class CategoryPlanController extends Controller {
             ->leftJoin('products_1c_nomenclature p1cn', 'p1cn.id = sp.product_id')
             ->where(['between', 's.date', $date_start, $date_end])
             ->andWhere(['order_id' => ['', '0']])
-            ->andWhere(['not in', 'p1cn.category', ['',  'сервис']])
+            ->andWhere(['not in', 'p1c.category', ['', 'букет', 'сборка', 'сервис']])
             ->andWhere(['s.store_id' => $model->store_id])
             ->groupBy(['s.store_id', "TO_CHAR(s.date, 'YYYY-MM')", "p1cn.category"])
             ->orderBy(['month' => SORT_ASC, 'p1cn.category' => SORT_ASC])
@@ -111,7 +111,7 @@ class CategoryPlanController extends Controller {
             ->where(['between', 's.date', $date_start, $date_end])
             ->andWhere(['not in', 'order_id', ['', '0']])
             ->andWhere(['s.store_id' => $model->store_id])
-            ->andWhere(['not in', 'p1cn.category', ['',  'сервис']])
+            ->andWhere(['not in', 'p1c.category', ['', 'букет', 'сборка', 'сервис']])
             ->groupBy(['s.store_id', "TO_CHAR(s.date, 'YYYY-MM')", "p1cn.category"])
             ->orderBy(['month' => SORT_ASC, 'p1cn.category' => SORT_ASC])
             ->asArray()
@@ -136,7 +136,7 @@ class CategoryPlanController extends Controller {
             ->leftJoin('products_1c_nomenclature p1cn', 'p1cn.id = wop.product_id')
             ->where(['between', 'wo.date', $date_start, $date_end])
             ->andWhere(['wo.type' => WriteOffsErp::WRITE_OFFS_TYPE_BRAK])
-            ->andWhere(['not in', 'p1cn.category', ['',  'сервис']])
+            ->andWhere(['not in', 'p1c.category', ['', 'букет', 'сборка', 'сервис']])
             ->andWhere(['wo.store_id' => $store_id])
             ->groupBy(["month", 'p1cn.category'])
             ->asArray()->all();