Merge remote-tracking branch 'origin/master'

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')