From: marina <m.zozirova@gmail.com>
Date: Wed, 7 May 2025 06:54:32 +0000 (+0300)
Subject: ERP-413 Обработка ОС Планограмма (месяц)
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f1093dc8e4699ddcd9958eb74c9ed350ff15b726;p=erp24_rep%2Fyii-erp24%2F.git

ERP-413 Обработка ОС Планограмма (месяц)
---

diff --git a/erp24/services/AutoPlannogrammaService.php b/erp24/services/AutoPlannogrammaService.php
index 6a546880..19e426b8 100644
--- a/erp24/services/AutoPlannogrammaService.php
+++ b/erp24/services/AutoPlannogrammaService.php
@@ -17,17 +17,16 @@ class AutoPlannogrammaService
 
     public function getStoreTotals(array $storeIds, string $dateFrom, ?array $productFilter = null, string $type = 'sales', ?string $dateTo = null): array
     {
-
         $query = (new Query())
             ->select([
                 'store_id' => 'ex.entity_id',
                 'total_sum' => new Expression(
                     $type === 'writeOffs'
                         ? 'SUM(wp.summ)'
-                        : 'SUM(sp.summ)'
+                        : "SUM(CASE WHEN s.operation = 'продажа' THEN sp.summ ELSE 0 END)"
                 )
             ])
-            ->from(['w' => $type == 'writeOffs' ? 'write_offs' : 'sales']);
+            ->from(['s' => $type === 'writeOffs' ? 'write_offs' : 'sales']);
 
         if ($type == 'writeOffs') {
                 $query->leftJoin('export_import_table ex', 'ex.export_val = w.store_id')