Merge remote-tracking branch 'origin/master'

2026-05-15 14:33:35 +03:00
parent 562d397480
commit dacd3aefa9
14 changed files with 2409 additions and 17 deletions
--- a/svc/routes/production_product_costing.go
+++ b/svc/routes/production_product_costing.go
@@ -566,6 +566,8 @@ func GetProductionHasCostDetailHeaderHandler(w http.ResponseWriter, r *http.Requ
 		if err := row.Scan(
 			&item.UretimiYapanFirma,
 			&item.SonIsEmriVeren,
+			&item.FirmaKodu,
+			&item.NFirmaID,
 			&item.NOnMLNo,
 			&item.UrunKodu,
 			&item.UrunAdi,
@@ -631,6 +633,8 @@ func GetProductionHasCostDetailHeaderHandler(w http.ResponseWriter, r *http.Requ
 	if err := row.Scan(
 		&item.UretimiYapanFirma,
 		&item.SonIsEmriVeren,
+		&item.FirmaKodu,
+		&item.NFirmaID,
 		&item.NOnMLNo,
 		&item.UrunKodu,
 		&item.UrunAdi,
@@ -881,6 +885,827 @@ func GetProductionHasCostDetailEditorOptionsHandler(w http.ResponseWriter, r *ht
 	http.Error(w, "kind hammadde, item veya color olmali", http.StatusBadRequest)
 }

+// GET /api/pricing/production-product-costing/default-quantities
+func GetProductionProductCostingDefaultQuantitiesHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+	search := strings.TrimSpace(r.URL.Query().Get("search"))
+	limit := parsePositiveIntOrDefault(r.URL.Query().Get("limit"), 500)
+
+	// Always list only active hammadde turleri.
+	rows, err := queries.ListProductionProductCostingDefaultQtyRows(ctx, uretimDB, search, limit)
+	if err != nil {
+		http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+		return
+	}
+	defer rows.Close()
+
+	out := make([]models.ProductionProductCostingDefaultQtyRow, 0, 256)
+	for rows.Next() {
+		var item models.ProductionProductCostingDefaultQtyRow
+		if err := rows.Scan(&item.NHammaddeTuruNo, &item.SAciklama, &item.LDefaultMiktar, &item.DteCalcTarihi, &item.BAktif); err != nil {
+			http.Error(w, "Veritabani satir hatasi", http.StatusInternalServerError)
+			return
+		}
+		out = append(out, item)
+	}
+	if err := rows.Err(); err != nil {
+		http.Error(w, "Veritabani satir hatasi", http.StatusInternalServerError)
+		return
+	}
+	_ = json.NewEncoder(w).Encode(out)
+}
+
+// POST /api/pricing/production-product-costing/default-quantities/upsert
+func PostProductionProductCostingDefaultQuantitiesUpsertHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+
+	var req models.ProductionProductCostingDefaultQtyUpdateRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, "Gecersiz JSON", http.StatusBadRequest)
+		return
+	}
+	if req.NHammaddeTuruNo <= 0 {
+		http.Error(w, "nHammaddeTuruNo zorunlu", http.StatusBadRequest)
+		return
+	}
+	if req.LDefaultMiktar <= 0 {
+		http.Error(w, "lDefaultMiktar pozitif olmali", http.StatusBadRequest)
+		return
+	}
+
+	if err := queries.UpsertProductionProductCostingDefaultQtyRow(ctx, uretimDB, req.NHammaddeTuruNo, req.LDefaultMiktar, req.BAktif); err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	_ = json.NewEncoder(w).Encode(map[string]any{"ok": true})
+}
+
+// POST /api/pricing/production-product-costing/default-quantities/update-bulk
+func PostProductionProductCostingDefaultQuantitiesBulkUpdateHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+
+	var req models.ProductionProductCostingDefaultQtyBulkUpdateRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, "Gecersiz JSON", http.StatusBadRequest)
+		return
+	}
+	if len(req.Items) == 0 {
+		_ = json.NewEncoder(w).Encode(map[string]any{"ok": true, "updated": 0})
+		return
+	}
+	if len(req.Items) > 5000 {
+		http.Error(w, "cok fazla satir", http.StatusBadRequest)
+		return
+	}
+
+	tx, err := uretimDB.BeginTx(ctx, nil)
+	if err != nil {
+		http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+		return
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	updated := 0
+	for _, item := range req.Items {
+		if item.NHammaddeTuruNo <= 0 {
+			http.Error(w, "nHammaddeTuruNo zorunlu", http.StatusBadRequest)
+			return
+		}
+		if item.LDefaultMiktar <= 0 {
+			http.Error(w, "lDefaultMiktar pozitif olmali", http.StatusBadRequest)
+			return
+		}
+		activeVal := -1
+		if item.BAktif != nil {
+			if *item.BAktif {
+				activeVal = 1
+			} else {
+				activeVal = 0
+			}
+		}
+		sqlText := `
+UPDATE dbo.mk_MaliyetParcaEslestirme_vmiktarlar
+SET
+	lDefaultMiktar = @p2,
+	dteCalcTarihi = GETDATE(),
+	bAktif = CASE WHEN @p3 < 0 THEN ISNULL(bAktif, 1) ELSE @p3 END
+WHERE nHammaddeTuruNo = @p1;
+SELECT @@ROWCOUNT;
+`
+		var affected int
+		if err := tx.QueryRowContext(ctx, sqlText, item.NHammaddeTuruNo, item.LDefaultMiktar, activeVal).Scan(&affected); err != nil {
+			http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+			return
+		}
+		if affected == 0 {
+			http.Error(w, "satir bulunamadi: "+strconv.Itoa(item.NHammaddeTuruNo), http.StatusBadRequest)
+			return
+		}
+		updated++
+	}
+
+	if err := tx.Commit(); err != nil {
+		http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+		return
+	}
+	_ = json.NewEncoder(w).Encode(map[string]any{"ok": true, "updated": updated})
+}
+
+// POST /api/pricing/production-product-costing/default-quantities/calc-avg
+func PostProductionProductCostingDefaultQuantitiesCalcAvgHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+
+	var req models.ProductionProductCostingDefaultQtyCalcRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, "Gecersiz JSON", http.StatusBadRequest)
+		return
+	}
+	if req.NHammaddeTuruNo <= 0 {
+		http.Error(w, "nHammaddeTuruNo zorunlu", http.StatusBadRequest)
+		return
+	}
+	if req.TopN <= 0 {
+		req.TopN = 10
+	}
+
+	avg, cnt, err := queries.CalcProductionProductCostingDefaultQtyFromLastOnML(ctx, uretimDB, req.NHammaddeTuruNo, req.TopN)
+	if err != nil {
+		http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+		return
+	}
+	_ = json.NewEncoder(w).Encode(models.ProductionProductCostingDefaultQtyCalcResponse{
+		NHammaddeTuruNo: req.NHammaddeTuruNo,
+		LDefaultMiktar:  avg,
+		NSampleCount:    cnt,
+	})
+}
+
+// POST /api/pricing/production-product-costing/default-quantities/lookup
+func PostProductionProductCostingDefaultQuantitiesLookupHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+
+	var req models.ProductionProductCostingDefaultQtyLookupRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, "Gecersiz JSON", http.StatusBadRequest)
+		return
+	}
+
+	m, err := queries.LookupProductionProductCostingDefaultQtyByNos(ctx, uretimDB, req.NHammaddeTuruNos)
+	if err != nil {
+		http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+		return
+	}
+	out := make([]models.ProductionProductCostingDefaultQtyLookupItem, 0, len(m))
+	for no, qty := range m {
+		out = append(out, models.ProductionProductCostingDefaultQtyLookupItem{
+			NHammaddeTuruNo: no,
+			LDefaultMiktar:  qty,
+		})
+	}
+	_ = json.NewEncoder(w).Encode(out)
+}
+
+// POST /api/pricing/production-product-costing/default-quantities/refresh
+func PostProductionProductCostingDefaultQuantitiesRefreshHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+
+	topN := parsePositiveIntOrDefault(r.URL.Query().Get("top_n"), 10)
+	if err := queries.RefreshProductionProductCostingDefaultQty(ctx, uretimDB, topN); err != nil {
+		http.Error(w, "Veritabani hatasi", http.StatusInternalServerError)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	_ = json.NewEncoder(w).Encode(map[string]any{"ok": true, "top_n": topN})
+}
+
+// POST /api/pricing/production-product-costing/onml/save
+func PostProductionProductCostingOnMLSaveHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	uretimDB := db.GetUretimDB()
+	if uretimDB == nil {
+		http.Error(w, "URETIM veritabani baglantisi aktif degil", http.StatusServiceUnavailable)
+		return
+	}
+	mssqlDB := db.GetDB()
+
+	claims, _ := auth.GetClaimsFromContext(r.Context())
+	user := ""
+	if claims != nil {
+		user = strings.TrimSpace(claims.Username)
+	}
+
+	traceID := utils.TraceIDFromRequest(r)
+	ctx := utils.ContextWithTraceID(r.Context(), traceID)
+	logger := utils.SlogFromContext(ctx).With("handler", "production-product-costing.onml.save")
+
+	var req models.ProductionProductCostingOnMLSaveRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		logger.Warn("invalid json", "err", err)
+		http.Error(w, "Gecersiz JSON", http.StatusBadRequest)
+		return
+	}
+
+	req.DetailSource = strings.ToLower(strings.TrimSpace(req.DetailSource))
+	req.Header.UrunKodu = strings.TrimSpace(req.Header.UrunKodu)
+	req.Header.UrunAdi = strings.TrimSpace(req.Header.UrunAdi)
+	req.Header.MaliyetTarihi = strings.TrimSpace(req.Header.MaliyetTarihi)
+	req.Header.SAciklama = strings.TrimSpace(req.Header.SAciklama)
+	req.Header.FirmaKodu = strings.TrimSpace(req.Header.FirmaKodu)
+
+	if req.Header.UrunKodu == "" || req.Header.MaliyetTarihi == "" {
+		http.Error(w, "urun_kodu ve maliyet_tarihi zorunlu", http.StatusBadRequest)
+		return
+	}
+
+	// Resolve exchange rates (for price conversions).
+	usdRate := 0.0
+	eurRate := 0.0
+	gbpRate := 0.0
+	if mssqlDB != nil {
+		row, err := queries.GetProductionHasCostDetailExchangeRatesByDate(ctx, mssqlDB, req.Header.MaliyetTarihi)
+		if err != nil {
+			logger.Error("exchange rate query error", "err", err)
+			http.Error(w, "Kur bilgisi alinamadi", http.StatusInternalServerError)
+			return
+		}
+		var rateDate string
+		if err := row.Scan(&rateDate, &usdRate, &eurRate, &gbpRate); err != nil {
+			logger.Error("exchange rate scan error", "err", err)
+			http.Error(w, "Kur bilgisi alinamadi", http.StatusInternalServerError)
+			return
+		}
+	}
+	if usdRate <= 0 {
+		usdRate = 1
+	}
+	if eurRate <= 0 {
+		eurRate = 1
+	}
+	if gbpRate <= 0 {
+		gbpRate = 1
+	}
+
+	// Resolve firma id
+	firmaID := req.Header.NFirmaID
+	if firmaID <= 0 && req.Header.FirmaKodu != "" {
+		id, err := queries.LookupFirmaIDByKodu(ctx, uretimDB, req.Header.FirmaKodu)
+		if err != nil {
+			logger.Error("firma lookup error", "err", err)
+			http.Error(w, "Firma bulunamadi", http.StatusBadRequest)
+			return
+		}
+		firmaID = id
+	}
+	if firmaID <= 0 {
+		http.Error(w, "Firma secilmeden kaydedilemez (n_firma_id / firma_kodu)", http.StatusBadRequest)
+		return
+	}
+
+	// Resolve or generate nOnMLNo
+	nOnMLNo := req.Header.NOnMLNo
+	if nOnMLNo <= 0 {
+		next, err := queries.GetNextOnMLNoFrom100k(ctx, uretimDB)
+		if err != nil {
+			logger.Error("next onmlno error", "err", err)
+			http.Error(w, "Yeni nOnMLNo uretilemedi", http.StatusInternalServerError)
+			return
+		}
+		nOnMLNo = next
+	}
+
+	// Resolve / create nMamulTuruNo from product groups (UrunAna + UrunAlt)
+	nMamulTuruNo := 1
+
+	// Compute totals from incoming rows (TRY/USD/EUR)
+	totalTRY := 0.0
+	totalUSD := 0.0
+	totalEUR := 0.0
+	for _, r := range req.Detail.Upserts {
+		qty := r.LMiktar
+		if qty < 0 {
+			qty = 0
+		}
+		// Convert input price to TRY (unit)
+		cur := strings.ToUpper(strings.TrimSpace(r.FiyatDoviz))
+		in := r.FiyatGirilen
+		unitTRY := in
+		switch cur {
+		case "USD":
+			unitTRY = in * usdRate
+		case "EUR":
+			unitTRY = in * eurRate
+		case "GBP":
+			unitTRY = in * gbpRate
+		case "TRY", "TL", "":
+			unitTRY = in
+		default:
+			unitTRY = in
+		}
+		unitUSD := unitTRY / usdRate
+		unitEUR := unitTRY / eurRate
+		totalTRY += unitTRY * qty
+		totalUSD += unitUSD * qty
+		totalEUR += unitEUR * qty
+	}
+
+	// Parse Tarihi
+	tarihi, err := time.Parse("2006-01-02", req.Header.MaliyetTarihi)
+	if err != nil {
+		http.Error(w, "maliyet_tarihi YYYY-MM-DD formatinda olmali", http.StatusBadRequest)
+		return
+	}
+
+	tx, err := uretimDB.BeginTx(ctx, nil)
+	if err != nil {
+		logger.Error("tx begin error", "err", err)
+		http.Error(w, "Islem baslatilamadi", http.StatusInternalServerError)
+		return
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	// Determine mamul turu inside same tx (to keep create atomic)
+	mamulLabel := ""
+	if mssqlDB != nil {
+		_, ana, alt, err := queries.GetProductIlkAnaAltGrupByUrunKodu(ctx, mssqlDB, req.Header.UrunKodu)
+		if err == nil {
+			ana = strings.TrimSpace(ana)
+			alt = strings.TrimSpace(alt)
+			if alt == "" || alt == "-" {
+				mamulLabel = ana
+			} else {
+				// matches inserted convention: "ANA-ALT" (no spaces)
+				mamulLabel = strings.TrimSpace(ana + "-" + alt)
+			}
+		}
+	}
+	if strings.TrimSpace(mamulLabel) != "" && mamulLabel != "-" {
+		mt, err := queries.GetOnMLMamulTuruNoByAciklama(ctx, tx, mamulLabel)
+		if err != nil {
+			logger.Error("mamul turu resolve error", "err", err)
+			http.Error(w, "Mamul turu olusturulamadi", http.StatusInternalServerError)
+			return
+		}
+		if mt <= 0 {
+			http.Error(w, "Mamul turu bulunamadi: "+mamulLabel, http.StatusBadRequest)
+			return
+		}
+		nMamulTuruNo = mt
+	} else {
+		nMamulTuruNo = 1
+	}
+
+	var receteID sql.NullInt64
+	if req.Header.NUrtReceteID > 0 {
+		receteID = sql.NullInt64{Int64: int64(req.Header.NUrtReceteID), Valid: true}
+	}
+	var uretimSekliID sql.NullInt64
+	if req.Header.UretimSekliID > 0 {
+		uretimSekliID = sql.NullInt64{Int64: int64(req.Header.UretimSekliID), Valid: true}
+	}
+	var sAciklama sql.NullString
+	if req.Header.SAciklama != "" {
+		sAciklama = sql.NullString{String: req.Header.SAciklama, Valid: true}
+	}
+
+	if err := queries.UpsertOnMLHeader(tx, ctx, queries.OnMLHeaderUpsertArgs{
+		NOnMLNo:       nOnMLNo,
+		UrunKodu:      req.Header.UrunKodu,
+		UrunAdi:       req.Header.UrunAdi,
+		Tarihi:        tarihi,
+		NMamulTuruNo:  nMamulTuruNo,
+		NUrtReceteID:  receteID,
+		UretimSekliID: uretimSekliID,
+		SAciklama:     sAciklama,
+		NFirmaID:      firmaID,
+		SUser:         user,
+		LTutarTL:      totalTRY,
+		LTutarUSD:     totalUSD,
+		LTutarEURO:    totalEUR,
+		SDovizCinsi:   "USD",
+		LTutarDoviz:   totalUSD,
+	}); err != nil {
+		logger.Error("header upsert error", "err", err)
+		http.Error(w, "Header kaydedilemedi", http.StatusInternalServerError)
+		return
+	}
+
+	// Deletes
+	for _, d := range req.Detail.Deletes {
+		if d.NOnMLDetNo <= 0 {
+			continue
+		}
+		if _, err := tx.ExecContext(ctx, `DELETE FROM dbo.spUrtOnMLMasDet WHERE nOnMLNo=@p1 AND nOnMLDetNo=@p2`, nOnMLNo, d.NOnMLDetNo); err != nil {
+			logger.Error("detail delete error", "err", err)
+			http.Error(w, "Detay silinemedi", http.StatusInternalServerError)
+			return
+		}
+	}
+
+	// Upserts
+	for _, row := range req.Detail.Upserts {
+		if row.NOnMLDetNo <= 0 {
+			continue
+		}
+		if row.NHammaddeTuruNo <= 0 || strings.TrimSpace(row.SKodu) == "" {
+			http.Error(w, "Detay satirinda n_hammadde_turu_no ve s_kodu zorunlu", http.StatusBadRequest)
+			return
+		}
+		qty := row.LMiktar
+		if qty < 0 {
+			qty = 0
+		}
+		cur := strings.ToUpper(strings.TrimSpace(row.FiyatDoviz))
+		in := row.FiyatGirilen
+		unitTRY := in
+		switch cur {
+		case "USD":
+			unitTRY = in * usdRate
+		case "EUR":
+			unitTRY = in * eurRate
+		case "GBP":
+			unitTRY = in * gbpRate
+		case "TRY", "TL", "":
+			unitTRY = in
+		default:
+			unitTRY = in
+		}
+		unitUSD := unitTRY / usdRate
+
+		lTutar := unitTRY * qty
+		lDovizTutari := unitUSD * qty
+
+		// Resolve stock type id from tbStok by sKodu (exact), then fallback to model-based match.
+		// Note: In this DB, stock type is stored as tbStok.nStokTipi but spUrtOnMLMasDet expects nStokTipiID (int).
+		rawSKodu := strings.TrimSpace(row.SKodu)
+		var nStokTipiID int
+		err := tx.QueryRowContext(ctx, `
+SELECT TOP 1 ISNULL(CONVERT(int, ISNULL(S.nStokTipi, 0)), 0) AS nStokTipiID
+FROM dbo.tbStok S WITH (NOLOCK)
+WHERE ISNULL(S.IsBlocked, 0) = 0
+  AND (
+    REPLACE(LTRIM(RTRIM(ISNULL(S.sKodu,''))), ' ', '') = REPLACE(@p1, ' ', '')
+    OR LTRIM(RTRIM(ISNULL(S.sModel,''))) = @p1
+    OR @p1 LIKE LTRIM(RTRIM(ISNULL(S.sModel,''))) + '%'
+  )
+ORDER BY
+  CASE
+    WHEN REPLACE(LTRIM(RTRIM(ISNULL(S.sKodu,''))), ' ', '') = REPLACE(@p1, ' ', '') THEN 0
+    WHEN LTRIM(RTRIM(ISNULL(S.sModel,''))) = @p1 THEN 1
+    ELSE 2
+  END,
+  S.dteKayitTarihi DESC,
+  S.nStokID DESC
+`, rawSKodu).Scan(&nStokTipiID)
+		if err != nil {
+			if err == sql.ErrNoRows {
+				http.Error(w, "Stok tipi bulunamadi (s_kodu="+rawSKodu+")", http.StatusBadRequest)
+				return
+			}
+			logger.Error("stok tipi lookup error", "err", err)
+			http.Error(w, "Stok tipi bulunamadi (tbStok sorgu hatasi)", http.StatusInternalServerError)
+			return
+		}
+		if nStokTipiID <= 0 {
+			http.Error(w, "Stok tipi bulunamadi (s_kodu="+rawSKodu+")", http.StatusBadRequest)
+			return
+		}
+
+		// Dummy/system-mapped required fields:
+		const bOtoFiyat = 0
+		const lFireOrani = 0
+		const nTutarGirisTipiNo = 1
+		const sFiyatTipi = "ML"
+		const nKurTipiNo = 6
+		const lEkMasraf = 0
+		const lMiktar2 = 0
+		const lEkFiyat = 0
+
+		// MERGE by (nOnMLNo, nOnMLDetNo)
+		mergeSQL := `
+MERGE dbo.spUrtOnMLMasDet AS T
+USING (SELECT @p1 AS nOnMLNo, @p2 AS nOnMLDetNo) AS S
+ON (T.nOnMLNo = S.nOnMLNo AND T.nOnMLDetNo = S.nOnMLDetNo)
+WHEN MATCHED THEN
+	UPDATE SET
+		nHammaddeTuruNo = @p3,
+		sKodu = @p4,
+		sAciklama = @p5,
+		sRenk = @p6,
+		sBeden = NULLIF(@p7,''),
+		sAciklama2 = NULLIF(@p8,''),
+		lMiktar = @p9,
+		lFiyat = @p10,
+		lTutar = @p11,
+		bOtoFiyat = @p12,
+		lFireOrani = @p13,
+		nTutarGirisTipiNo = @p14,
+		sFiyatTipi = @p15,
+		sDovizCinsi = @p16,
+		nKurTipiNo = @p17,
+		lDovizKuru = @p18,
+		lDovizFiyati = @p19,
+		sBirim = @p20,
+		lDovizTutari = @p21,
+		lEkMasraf = @p22,
+		lMiktar2 = @p23,
+		nStokTipiID = @p24,
+		lEkFiyat = @p25,
+		nUrtMTBolumID = @p26,
+		fiyat_girilen = NULLIF(@p27, 0),
+		fiyat_doviz = NULLIF(@p28,''),
+		Maliyete_dahil = @p29,
+		cm_price_type_id = @p30,
+		sKullaniciAdiDeg = @p31,
+		dteIslemTarihiDeg = GETDATE()
+WHEN NOT MATCHED THEN
+	INSERT (
+		nOnMLNo,nOnMLDetNo,nHammaddeTuruNo,sKodu,sAciklama,sRenk,lMiktar,lFiyat,lTutar,
+		bOtoFiyat,lFireOrani,nTutarGirisTipiNo,sFiyatTipi,sDovizCinsi,nKurTipiNo,lDovizKuru,lDovizFiyati,
+		sBirim,sAciklama2,lDovizTutari,lEkMasraf,sKullaniciAdi,dteIslemTarihi,sBeden,sAciklama3,lMiktar2,nStokTipiID,
+		lEkFiyat,nUrtMTBolumID,fiyat_girilen,fiyat_doviz,Maliyete_dahil,cm_price_type_id
+	)
+	VALUES (
+		@p1,@p2,@p3,@p4,@p5,@p6,@p9,@p10,@p11,
+		@p12,@p13,@p14,@p15,@p16,@p17,@p18,@p19,
+		@p20,NULLIF(@p8,''),@p21,@p22,@p31,GETDATE(),NULLIF(@p7,''),NULL,@p23,@p24,
+		@p25,@p26,NULLIF(@p27,0),NULLIF(@p28,''),@p29,@p30
+	);
+`
+
+		if _, err := tx.ExecContext(
+			ctx,
+			mergeSQL,
+			nOnMLNo,
+			row.NOnMLDetNo,
+			row.NHammaddeTuruNo,
+			strings.TrimSpace(row.SKodu),
+			strings.TrimSpace(row.SAciklama),
+			strings.TrimSpace(row.SRenk),
+			strings.TrimSpace(row.SBeden),
+			strings.TrimSpace(row.SAciklama2),
+			qty,
+			unitTRY,
+			lTutar,
+			bOtoFiyat,
+			lFireOrani,
+			nTutarGirisTipiNo,
+			sFiyatTipi,
+			"USD",
+			nKurTipiNo,
+			usdRate,
+			unitUSD,
+			strings.TrimSpace(row.SBirim),
+			lDovizTutari,
+			lEkMasraf,
+			lMiktar2,
+			nStokTipiID,
+			lEkFiyat,
+			row.NUrtMTBolumID,
+			row.FiyatGirilen,
+			strings.TrimSpace(row.FiyatDoviz),
+			row.MaliyeteDahil,
+			row.CMPriceTypeID,
+			user,
+		); err != nil {
+			logger.Error("detail merge error", "err", err)
+			http.Error(w, "Detay kaydedilemedi", http.StatusInternalServerError)
+			return
+		}
+	}
+
+	// ============================================================
+	// Recipe sync (URETIM): ensure recipe contains all OnML hammadde rows
+	// so future no-cost loads don't keep showing them as missing.
+	// Table observed in queries: dbo.spUrtRecMBolumMik (nUrtMBolumID stores nHammaddeTuruNo).
+	// ============================================================
+	if req.Header.NUrtReceteID > 0 {
+		receteID := req.Header.NUrtReceteID
+
+		// Determine next available recipe detail id (nUrtRecMBolumID)
+		nextRecDetID := 0
+		_ = tx.QueryRowContext(ctx, `
+SELECT ISNULL(MAX(RMik.nUrtRecMBolumID), 0) + 1
+FROM dbo.spUrtRecMBolumMik RMik WITH (UPDLOCK, HOLDLOCK)
+WHERE RMik.nUrtReceteID = @p1
+`, receteID).Scan(&nextRecDetID)
+		if nextRecDetID <= 0 {
+			nextRecDetID = 1
+		}
+
+		for _, row := range req.Detail.Upserts {
+			hNo := row.NHammaddeTuruNo
+			if hNo <= 0 {
+				continue
+			}
+
+			// CM1/CM2 rows are cost-only and must NOT be written back into recipe tables.
+			// Source of truth: spUrtOnMLHammaddeTuru.sAciklama3 (e.g. 'CM2').
+			var grp sql.NullString
+			if err := tx.QueryRowContext(ctx, `
+SELECT TOP 1 LTRIM(RTRIM(ISNULL(H.sAciklama3, '')))
+FROM dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK)
+WHERE H.nHammaddeTuruNo = @p1
+`, hNo).Scan(&grp); err == nil {
+				g := strings.ToUpper(strings.TrimSpace(grp.String))
+				if g == "CM1" || g == "CM2" {
+					continue
+				}
+			}
+
+			// Resolve nHStokID from tbStok using sKodu (exact), then sModel fallback.
+			// IMPORTANT: nHStokID must be resolved; otherwise we'd update/insert too broadly.
+			rawSKodu := strings.TrimSpace(row.SKodu)
+			var nHStokID int
+			err := tx.QueryRowContext(ctx, `
+SELECT TOP 1 ISNULL(S.nStokID, 0)
+FROM dbo.tbStok S WITH (NOLOCK)
+WHERE ISNULL(S.IsBlocked, 0) = 0
+  AND (
+    REPLACE(LTRIM(RTRIM(ISNULL(S.sKodu,''))), ' ', '') = REPLACE(@p1, ' ', '')
+    OR LTRIM(RTRIM(ISNULL(S.sModel,''))) = @p1
+    OR @p1 LIKE LTRIM(RTRIM(ISNULL(S.sModel,''))) + '%'
+  )
+ORDER BY
+  CASE
+    WHEN REPLACE(LTRIM(RTRIM(ISNULL(S.sKodu,''))), ' ', '') = REPLACE(@p1, ' ', '') THEN 0
+    WHEN LTRIM(RTRIM(ISNULL(S.sModel,''))) = @p1 THEN 1
+    ELSE 2
+  END,
+  S.dteKayitTarihi DESC,
+  S.nStokID DESC
+`, rawSKodu).Scan(&nHStokID)
+			if err != nil {
+				if err == sql.ErrNoRows {
+					http.Error(w, "Recete sync icin stok bulunamadi (s_kodu="+rawSKodu+")", http.StatusBadRequest)
+					return
+				}
+				logger.Error("recipe stok lookup error", "err", err)
+				http.Error(w, "Recete sync stok bulunamadi", http.StatusInternalServerError)
+				return
+			}
+			if nHStokID == 0 {
+				http.Error(w, "Recete sync icin stok bulunamadi (s_kodu="+rawSKodu+")", http.StatusBadRequest)
+				return
+			}
+
+			// If we cannot resolve stock, we still try to insert by hammadde no only.
+			// Some recipes may omit nHStokID; but we prefer filling it when possible.
+
+			// Update quantity if row already exists for (recete, hammadde, stok)
+			var exists int
+			if err := tx.QueryRowContext(ctx, `
+SELECT COUNT(1)
+FROM dbo.spUrtRecMBolumMik RMik WITH (NOLOCK)
+WHERE RMik.nUrtReceteID = @p1
+  AND RMik.nUrtMBolumID = @p2
+  AND RMik.nHStokID = @p3
+`, receteID, hNo, nHStokID).Scan(&exists); err == nil && exists > 0 {
+				_, _ = tx.ExecContext(ctx, `
+UPDATE dbo.spUrtRecMBolumMik
+SET lHMiktar = @p4,
+	sKullaniciAdiDeg = @p5,
+	dteIslemTarihiDeg = GETDATE()
+WHERE nUrtReceteID = @p1
+  AND nUrtMBolumID = @p2
+  AND nHStokID = @p3
+`, receteID, hNo, nHStokID, row.LMiktar, user)
+				continue
+			}
+
+			// Insert missing: best-effort with minimal columns.
+			// NOTE: This assumes nUrtRecMBolumID can be a sequential int and that other columns are nullable/have defaults.
+			_, insertErr := tx.ExecContext(ctx, `
+INSERT INTO dbo.spUrtRecMBolumMik (
+	nUrtReceteID,
+	nUrtUBolumID,
+	nUrtRecMBolumID,
+	nStokID,
+	nHStokID,
+	lHMiktar,
+	lHFire,
+	nMaliyetTipiID,
+	lHMaliyet,
+	lMiktar,
+	sIslemKodu,
+	nUrtMBolumID,
+	nUrtMTBolumID,
+	lHCarpan,
+	bIslem,
+	nSure,
+	sAciklama,
+	dteDovizTarihi,
+	sDovizCinsi,
+	lDovizOran,
+	lDovizFiyat,
+	sKullaniciAdi,
+	dteIslemTarihi,
+	nMBolumSarfTipiNo
+)
+VALUES (
+	@p1,
+	0,
+	@p2,
+	0,
+	@p3,
+	@p4,
+	0,
+	6,
+	0,
+	1,
+	'',
+	@p5,
+	@p6,
+	1,
+	0,
+	0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	@p7,
+	GETDATE(),
+	1
+)
+			`, receteID, nextRecDetID, nHStokID, row.LMiktar, hNo, row.NUrtMTBolumID, user)
+			if insertErr == nil {
+				nextRecDetID += 1
+			}
+		}
+	}
+
+	if err := tx.Commit(); err != nil {
+		logger.Error("tx commit error", "err", err)
+		http.Error(w, "Kaydetme tamamlanamadi", http.StatusInternalServerError)
+		return
+	}
+
+	// V3: update base price table so pricing screens reflect latest costing.
+	// Not transactional with URETIM DB; if this fails, URETIM save has already succeeded.
+	if mssqlDB != nil {
+		if err := queries.UpsertV3ItemBasePriceUSD(ctx, mssqlDB, req.Header.UrunKodu, req.Header.MaliyetTarihi, totalUSD, user); err != nil {
+			logger.Error("v3 base price upsert error", "err", err)
+			http.Error(w, "URETIM kaydedildi ama V3 maliyet guncellenemedi", http.StatusInternalServerError)
+			return
+		}
+	}
+
+	_ = json.NewEncoder(w).Encode(models.ProductionProductCostingOnMLSaveResponse{NOnMLNo: nOnMLNo})
+}
+
 // GET /api/pricing/production-product-costing/has-cost-detail-exchange-rates
 func GetProductionHasCostDetailExchangeRatesHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")