Merge remote-tracking branch 'origin/master'

svc/queries/statement_header.go

@@ -3,13 +3,14 @@ package queries
 import (
 	"bssapp-backend/db"
 	"bssapp-backend/models"
+	"context"
 	"database/sql"
 	"fmt"
 	"strings"
 )
 
 // Ana tabloyu getiren fonksiyon (Vue header tablosu için)
-func GetStatements(params models.StatementParams) ([]models.StatementHeader, error) {
+func GetStatements(ctx context.Context, params models.StatementParams) ([]models.StatementHeader, error) {
 
 	// AccountCode normalize: "ZLA0127" → "ZLA 0127"
 	params.AccountCode = normalizeMasterAccountCode(params.AccountCode)
@@ -33,6 +34,11 @@ func GetStatements(params models.StatementParams) ([]models.StatementHeader, err
 		}
 	}
 
+	piyasaScope, err := buildPiyasaExistsForCariCode(ctx, "b.CurrAccCode")
+	if err != nil {
+		return nil, err
+	}
+
 	query := fmt.Sprintf(`
 ;WITH CurrDesc AS (
     SELECT
@@ -58,6 +64,7 @@ HasMovement AS (
              AND f.ATAtt01 IN (%s)
             WHERE LEFT(REPLACE(b.CurrAccCode, ' ', ''), 7) = REPLACE(@Carikod, ' ', '')
               AND b.DocumentDate BETWEEN @startdate AND @enddate
+              AND %s
         ) THEN 1 ELSE 0 END AS HasMov
 ),
 
@@ -79,6 +86,7 @@ Opening AS (
       ON c.CurrAccBookID = b.CurrAccBookID
      AND c.CurrencyCode  = b.DocCurrencyCode
     WHERE LEFT(REPLACE(b.CurrAccCode, ' ', ''), 7) = REPLACE(@Carikod, ' ', '')
+      AND %s
       AND (
             (hm.HasMov = 1 AND b.DocumentDate <  @startdate)  -- hareket varsa: klasik devir
          OR (hm.HasMov = 0 AND b.DocumentDate <= @enddate)    -- hareket yoksa: enddate itibariyle bakiye
@@ -135,6 +143,7 @@ Movements AS (
      AND c.CurrencyCode  = b.DocCurrencyCode
 
     WHERE LEFT(REPLACE(b.CurrAccCode, ' ', ''), 7) = REPLACE(@Carikod, ' ', '')
+      AND %s
       AND b.DocumentDate BETWEEN @startdate AND @enddate
 )
 
@@ -201,12 +210,15 @@ ORDER BY
     Para_Birimi,
     Belge_Tarihi;
 `,
-		parislemFilter, // HasMovement
-		parislemFilter, // Opening
-		parislemFilter, // Movements
+		parislemFilter, // HasMovement ATAtt01
+		piyasaScope,    // HasMovement piyasa scope
+		parislemFilter, // Opening ATAtt01
+		piyasaScope,    // Opening piyasa scope
+		parislemFilter, // Movements ATAtt01
+		piyasaScope,    // Movements piyasa scope
 	)
 
-	rows, err := db.MssqlDB.Query(query,
+	rows, err := db.MssqlDB.QueryContext(ctx, query,
 		sql.Named("startdate", params.StartDate),
 		sql.Named("enddate", params.EndDate),
 		sql.Named("Carikod", params.AccountCode),