From f1093dc8e4699ddcd9958eb74c9ed350ff15b726 Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 7 May 2025 09:54:32 +0300 Subject: [PATCH] =?utf8?q?ERP-413=20=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=BA=D0=B0=20=D0=9E=D0=A1=20=D0=9F=D0=BB=D0=B0=D0=BD?= =?utf8?q?=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B0=20(=D0=BC=D0=B5=D1=81?= =?utf8?q?=D1=8F=D1=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/AutoPlannogrammaService.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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') -- 2.39.5