M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-05-06 11:12:55 +03:00
parent 77fe2b04b6
commit 0eef44697b
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
svc/queries/get_order_list_excel.go
View File

@@ -123,11 +123,7 @@ LEFT JOIN (
CASE CASE
WHEN ( WHEN (
ISNULL(l.IsClosed,0) = 1 ISNULL(l.IsClosed,0) = 1
OR EXISTS ( OR il.OrderLineID IS NOT NULL
SELECT 1
FROM dbo.trInvoiceLine il WITH (NOLOCK)
WHERE il.OrderLineID = l.OrderLineID
)
) )
AND c.CurrencyCode = h.DocCurrencyCode AND c.CurrencyCode = h.DocCurrencyCode
THEN c.NetAmount THEN c.NetAmount
@@ -140,11 +136,7 @@ LEFT JOIN (
CASE CASE
WHEN ( WHEN (
ISNULL(l.IsClosed,0) = 1 ISNULL(l.IsClosed,0) = 1
OR EXISTS ( OR il.OrderLineID IS NOT NULL
SELECT 1
FROM dbo.trInvoiceLine il WITH (NOLOCK)
WHERE il.OrderLineID = l.OrderLineID
)
) )
AND c.CurrencyCode = 'TRY' AND c.CurrencyCode = 'TRY'
THEN c.NetAmount THEN c.NetAmount
@@ -160,6 +152,13 @@ LEFT JOIN (
JOIN dbo.trOrderHeader h JOIN dbo.trOrderHeader h
ON h.OrderHeaderID = l.OrderHeaderID 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 GROUP BY l.OrderHeaderID
) t ON t.OrderHeaderID = h.OrderHeaderID ) t ON t.OrderHeaderID = h.OrderHeaderID

21
svc/queries/orderlist.go
View File

@@ -146,25 +146,14 @@ JOIN (
-- "Paketlenen" = satir kapaliysa VEYA satir irsaliyeye/faturaya baglandiysa. -- "Paketlenen" = satir kapaliysa VEYA satir irsaliyeye/faturaya baglandiysa.
-- Not: IsClosed her zaman guncellenmiyor; trInvoiceLine.OrderLineID iliskiyi yakalar. -- Not: IsClosed her zaman guncellenmiyor; trInvoiceLine.OrderLineID iliskiyi yakalar.
WHEN ISNULL(l.IsClosed,0) = 1 WHEN ISNULL(l.IsClosed,0) = 1
OR EXISTS ( OR il.OrderLineID IS NOT NULL
SELECT 1
FROM dbo.trInvoiceLine il WITH (NOLOCK)
WHERE il.OrderLineID = l.OrderLineID
)
THEN ISNULL(c.NetAmount,0) THEN ISNULL(c.NetAmount,0)
ELSE 0 ELSE 0
END END
) AS PackedAmount, ) AS PackedAmount,
SUM( SUM(
CASE CASE
WHEN ( WHEN (ISNULL(l.IsClosed,0) = 1 OR il.OrderLineID IS NOT NULL)
ISNULL(l.IsClosed,0) = 1
OR EXISTS (
SELECT 1
FROM dbo.trInvoiceLine il WITH (NOLOCK)
WHERE il.OrderLineID = l.OrderLineID
)
)
AND ISNULL(c.CurrencyCode,'') = 'TRY' AND ISNULL(c.CurrencyCode,'') = 'TRY'
THEN ISNULL(c.NetAmount,0) THEN ISNULL(c.NetAmount,0)
ELSE 0 ELSE 0
@@ -173,6 +162,12 @@ JOIN (
FROM dbo.trOrderLine l FROM dbo.trOrderLine l
JOIN dbo.trOrderHeader h2 JOIN dbo.trOrderHeader h2
ON h2.OrderHeaderID = l.OrderHeaderID 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 LEFT JOIN dbo.trOrderLineCurrency c
ON c.OrderLineID = l.OrderLineID ON c.OrderLineID = l.OrderLineID
AND c.CurrencyCode = ISNULL(h2.DocCurrencyCode,'TRY') AND c.CurrencyCode = ISNULL(h2.DocCurrencyCode,'TRY')