From 0eef44697b12648e12c23066a8a7370b348ab700 Mon Sep 17 00:00:00 2001
From: M_Kececi <you@example.com>
Date: Wed, 6 May 2026 11:12:55 +0300
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 svc/queries/get_order_list_excel.go | 19 +++++++++----------
 svc/queries/orderlist.go            | 21 ++++++++-------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/svc/queries/get_order_list_excel.go b/svc/queries/get_order_list_excel.go
index e060b17..0105d36 100644
--- a/svc/queries/get_order_list_excel.go
+++ b/svc/queries/get_order_list_excel.go
@@ -123,11 +123,7 @@ LEFT JOIN (
             CASE
                 WHEN (
                     ISNULL(l.IsClosed,0) = 1
-                    OR EXISTS (
-                        SELECT 1
-                        FROM dbo.trInvoiceLine il WITH (NOLOCK)
-                        WHERE il.OrderLineID = l.OrderLineID
-                    )
+                    OR il.OrderLineID IS NOT NULL
                 )
                  AND c.CurrencyCode = h.DocCurrencyCode
                     THEN c.NetAmount
@@ -140,11 +136,7 @@ LEFT JOIN (
             CASE
                 WHEN (
                     ISNULL(l.IsClosed,0) = 1
-                    OR EXISTS (
-                        SELECT 1
-                        FROM dbo.trInvoiceLine il WITH (NOLOCK)
-                        WHERE il.OrderLineID = l.OrderLineID
-                    )
+                    OR il.OrderLineID IS NOT NULL
                 )
                  AND c.CurrencyCode = 'TRY'
                     THEN c.NetAmount
@@ -160,6 +152,13 @@ LEFT JOIN (
     JOIN dbo.trOrderHeader h
         ON h.OrderHeaderID = l.OrderHeaderID
 
+    LEFT JOIN (
+        SELECT DISTINCT OrderLineID
+        FROM BAGGI_V3.dbo.trInvoiceLine WITH (NOLOCK)
+        WHERE OrderLineID IS NOT NULL
+    ) il
+        ON il.OrderLineID = l.OrderLineID
+
     GROUP BY l.OrderHeaderID
 
 ) t ON t.OrderHeaderID = h.OrderHeaderID
diff --git a/svc/queries/orderlist.go b/svc/queries/orderlist.go
index 4d7a515..7a5ec56 100644
--- a/svc/queries/orderlist.go
+++ b/svc/queries/orderlist.go
@@ -146,25 +146,14 @@ JOIN (
                 -- "Paketlenen" = satir kapaliysa VEYA satir irsaliyeye/faturaya baglandiysa.
                 -- Not: IsClosed her zaman guncellenmiyor; trInvoiceLine.OrderLineID iliskiyi yakalar.
                 WHEN ISNULL(l.IsClosed,0) = 1
-                  OR EXISTS (
-                      SELECT 1
-                      FROM dbo.trInvoiceLine il WITH (NOLOCK)
-                      WHERE il.OrderLineID = l.OrderLineID
-                  )
+                  OR il.OrderLineID IS NOT NULL
                     THEN ISNULL(c.NetAmount,0)
                 ELSE 0
             END
         ) AS PackedAmount,
         SUM(
             CASE
-                WHEN (
-                  ISNULL(l.IsClosed,0) = 1
-                  OR EXISTS (
-                      SELECT 1
-                      FROM dbo.trInvoiceLine il WITH (NOLOCK)
-                      WHERE il.OrderLineID = l.OrderLineID
-                  )
-                )
+                WHEN (ISNULL(l.IsClosed,0) = 1 OR il.OrderLineID IS NOT NULL)
                 AND ISNULL(c.CurrencyCode,'') = 'TRY'
                     THEN ISNULL(c.NetAmount,0)
                 ELSE 0
@@ -173,6 +162,12 @@ JOIN (
     FROM dbo.trOrderLine l
     JOIN dbo.trOrderHeader h2
       ON h2.OrderHeaderID = l.OrderHeaderID
+    LEFT JOIN (
+        SELECT DISTINCT OrderLineID
+        FROM BAGGI_V3.dbo.trInvoiceLine WITH (NOLOCK)
+        WHERE OrderLineID IS NOT NULL
+    ) il
+      ON il.OrderLineID = l.OrderLineID
     LEFT JOIN dbo.trOrderLineCurrency c
       ON c.OrderLineID  = l.OrderLineID
      AND c.CurrencyCode = ISNULL(h2.DocCurrencyCode,'TRY')