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-20 13:28:19 +03:00
parent 3f6c9e4074
commit 6fdc0b4ac5
1 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
svc/routes/production_product_costing.go
View File

@@ -374,9 +374,10 @@ func GetProductionHasCostDetailGroupsHandler(w http.ResponseWriter, r *http.Requ
} }
scannedRows += 1 scannedRows += 1
item.NOnMLNo, _ = strconv.Atoi(nOnMLNoStr) // Model fields are strings; keep as-is to avoid type mismatches.
item.NOnMLDetNo, _ = strconv.Atoi(nOnMLDetNoStr) item.NOnMLNo = strings.TrimSpace(nOnMLNoStr)
item.NHammaddeTuruNo, _ = strconv.Atoi(hNoStr) item.NOnMLDetNo = strings.TrimSpace(nOnMLDetNoStr)
item.NHammaddeTuruNo = strings.TrimSpace(hNoStr)
if fiyatGirilen.Valid { if fiyatGirilen.Valid {
item.FiyatGirilen = new(float64) item.FiyatGirilen = new(float64)
@@ -496,9 +497,10 @@ func GetProductionHasCostDetailGroupsHandler(w http.ResponseWriter, r *http.Requ
} }
scannedRows++ scannedRows++
item.NOnMLNo, _ = strconv.Atoi(nOnMLNoStr) // Model fields are strings; keep as-is to avoid type mismatches.
item.NOnMLDetNo, _ = strconv.Atoi(nOnMLDetNoStr) item.NOnMLNo = strings.TrimSpace(nOnMLNoStr)
item.NHammaddeTuruNo, _ = strconv.Atoi(hNoStr) item.NOnMLDetNo = strings.TrimSpace(nOnMLDetNoStr)
item.NHammaddeTuruNo = strings.TrimSpace(hNoStr)
if fiyatGirilen.Valid { if fiyatGirilen.Valid {
item.FiyatGirilen = new(float64) item.FiyatGirilen = new(float64)
@@ -1756,6 +1758,22 @@ WHERE RMik.nUrtReceteID = @p1
AND RMik.nUrtMBolumID = @p2 AND RMik.nUrtMBolumID = @p2
AND LTRIM(RTRIM(RMik.nHStokID_G)) = @p3 AND LTRIM(RTRIM(RMik.nHStokID_G)) = @p3
`, receteID, hNo, rawSKodu).Scan(&exists); err == nil && exists > 0 { `, receteID, hNo, rawSKodu).Scan(&exists); err == nil && exists > 0 {
// Compute TRY unit price for recipe mirror columns.
cur := strings.ToUpper(strings.TrimSpace(row.FiyatDoviz))
in := row.FiyatGirilen
unitTRYRec := in
switch cur {
case "USD":
unitTRYRec = in * usdRate
case "EUR":
unitTRYRec = in * eurRate
case "GBP":
unitTRYRec = in * gbpRate
case "TRY", "TL", "":
unitTRYRec = in
default:
unitTRYRec = in
}
_, _ = tx.ExecContext(ctx, ` _, _ = tx.ExecContext(ctx, `
UPDATE dbo.spUrtRecMBolumMik UPDATE dbo.spUrtRecMBolumMik
SET lHMiktar_G = @p4, SET lHMiktar_G = @p4,
@@ -1766,11 +1784,27 @@ SET lHMiktar_G = @p4,
WHERE nUrtReceteID = @p1 WHERE nUrtReceteID = @p1
AND nUrtMBolumID = @p2 AND nUrtMBolumID = @p2
AND LTRIM(RTRIM(nHStokID_G)) = @p3 AND LTRIM(RTRIM(nHStokID_G)) = @p3
`, receteID, hNo, rawSKodu, row.LMiktar, unitTRY, user, row.MaliyeteDahil) `, receteID, hNo, rawSKodu, row.LMiktar, unitTRYRec, user, row.MaliyeteDahil)
continue continue
} }
// Insert missing: using _G columns and storing code in nHStokID_G. // Insert missing: using _G columns and storing code in nHStokID_G.
// Compute TRY unit price for recipe mirror columns.
cur := strings.ToUpper(strings.TrimSpace(row.FiyatDoviz))
in := row.FiyatGirilen
unitTRYRec := in
switch cur {
case "USD":
unitTRYRec = in * usdRate
case "EUR":
unitTRYRec = in * eurRate
case "GBP":
unitTRYRec = in * gbpRate
case "TRY", "TL", "":
unitTRYRec = in
default:
unitTRYRec = in
}
_, insertErr := tx.ExecContext(ctx, ` _, insertErr := tx.ExecContext(ctx, `
INSERT INTO dbo.spUrtRecMBolumMik ( INSERT INTO dbo.spUrtRecMBolumMik (
nUrtReceteID, nUrtReceteID,
@@ -1816,7 +1850,7 @@ VALUES (
GETDATE(), GETDATE(),
1 1
) )
`, receteID, nextRecDetID, rawSKodu, row.LMiktar, unitTRY, hNo, row.NUrtMTBolumID, row.MaliyeteDahil, user) `, receteID, nextRecDetID, rawSKodu, row.LMiktar, unitTRYRec, hNo, row.NUrtMTBolumID, row.MaliyeteDahil, user)
if insertErr == nil { if insertErr == nil {
nextRecDetID += 1 nextRecDetID += 1
} }