Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-24 19:47:09 +03:00
parent 62bf272f17
commit 10fd77bece
19 changed files with 141 additions and 141 deletions

View File

@@ -441,18 +441,18 @@ func loadCariMetaMap(ctx context.Context, lines []mkCariBakiyeLine) (map[string]
ILCE = ISNULL(CASE WHEN c.CurrAccTypeCode=1 THEN vad.VendorAtt07Desc ELSE cad.CustomerAtt07Desc END, ''),
TC = ISNULL(c.IdentityNum, ''),
Risk_Durumu = ISNULL(CASE WHEN c.CurrAccTypeCode=1 THEN vad.VendorAtt03Desc ELSE cad.CustomerAtt03Desc END, '')
FROM cdCurrAcc c WITH(NOLOCK)
LEFT JOIN cdCurrAccDesc d WITH(NOLOCK)
FROM cdCurrAcc c
LEFT JOIN cdCurrAccDesc d
ON d.CurrAccTypeCode = c.CurrAccTypeCode
AND d.CurrAccCode = c.CurrAccCode
AND d.LangCode = 'TR'
LEFT JOIN VendorAttributes va WITH(NOLOCK)
LEFT JOIN VendorAttributes va
ON va.CurrAccTypeCode = c.CurrAccTypeCode
AND va.CurrAccCode = c.CurrAccCode
LEFT JOIN VendorAttributeDescriptions('TR') vad
ON vad.CurrAccTypeCode = c.CurrAccTypeCode
AND vad.CurrAccCode = c.CurrAccCode
LEFT JOIN CustomerAttributes ca WITH(NOLOCK)
LEFT JOIN CustomerAttributes ca
ON ca.CurrAccTypeCode = c.CurrAccTypeCode
AND ca.CurrAccCode = c.CurrAccCode
LEFT JOIN CustomerAttributeDescriptions('TR') cad
@@ -530,7 +530,7 @@ func loadGLAccountMap(ctx context.Context, lines []mkCariBakiyeLine) (map[string
query := fmt.Sprintf(`
SELECT CurrAccTypeCode, CurrAccCode, CompanyCode, GLAccCode
FROM prCurrAccGLAccount WITH(NOLOCK)
FROM prCurrAccGLAccount
WHERE PostAccTypeCode = 100
AND CompanyCode IN (%s)
AND (%s)
@@ -561,7 +561,7 @@ func loadGLAccountMap(ctx context.Context, lines []mkCariBakiyeLine) (map[string
}
func loadCompanyMap(ctx context.Context) (map[int]string, error) {
rows, err := db.MssqlDB.QueryContext(ctx, `SELECT CompanyCode, CompanyName FROM cdCompany WITH(NOLOCK)`)
rows, err := db.MssqlDB.QueryContext(ctx, `SELECT CompanyCode, CompanyName FROM cdCompany`)
if err != nil {
return nil, fmt.Errorf("company map query error: %w", err)
}