Merge remote-tracking branch 'origin/master'

svc/queries/orderproduction_items.go

@@ -560,6 +560,8 @@ func UpdateOrderLinesTx(tx *sql.Tx, orderHeaderID string, lines []models.OrderPr
 
 		query := fmt.Sprintf(`
 SET NOCOUNT ON;
+DECLARE @updated TABLE (OrderLineID UNIQUEIDENTIFIER);
+
 ;WITH src (OrderLineID, NewItemCode, NewColor, ItemDim1Code, NewDim2, NewDesc, OldDueDate, NewDueDate) AS (
 	SELECT *
 	FROM (VALUES %s) AS v (OrderLineID, NewItemCode, NewColor, ItemDim1Code, NewDim2, NewDesc, OldDueDate, NewDueDate)
@@ -574,27 +576,114 @@ SET
 	l.DeliveryDate = CASE WHEN ISDATE(s.NewDueDate) = 1 THEN CAST(s.NewDueDate AS DATETIME) ELSE l.DeliveryDate END,
 	l.LastUpdatedUserName = @p%d,
 	l.LastUpdatedDate = GETDATE()
+OUTPUT inserted.OrderLineID INTO @updated(OrderLineID)
 FROM dbo.trOrderLine l
 JOIN src s
-	ON CAST(l.OrderLineID AS NVARCHAR(50)) = s.OrderLineID
-WHERE l.OrderHeaderID = @p%d;
+	ON l.OrderLineID = CONVERT(UNIQUEIDENTIFIER, s.OrderLineID)
+WHERE l.OrderHeaderID = CONVERT(UNIQUEIDENTIFIER, @p%d);
+
+SELECT COUNT(1) AS UpdatedCount FROM @updated;
 `, strings.Join(values, ","), usernameParam, orderHeaderParam)
 
 		chunkStart := time.Now()
-		res, execErr := tx.Exec(query, args...)
+		var chunkUpdated int64
+		execErr := tx.QueryRow(query, args...).Scan(&chunkUpdated)
 		if execErr != nil {
 			log.Printf("[UpdateOrderLinesTx] ERROR orderHeaderID=%s chunk=%d-%d err=%v", orderHeaderID, i, end, execErr)
 			return updated, fmt.Errorf("update lines chunk failed chunkStart=%d chunkEnd=%d duration_ms=%d: %w", i, end, time.Since(chunkStart).Milliseconds(), execErr)
 		}
-		log.Printf("[UpdateOrderLinesTx] orderHeaderID=%s chunk=%d-%d duration_ms=%d", orderHeaderID, i, end, time.Since(chunkStart).Milliseconds())
-
-		if rows, rowsErr := res.RowsAffected(); rowsErr == nil {
-			updated += rows
-		}
+		log.Printf("[UpdateOrderLinesTx] orderHeaderID=%s chunk=%d-%d updated=%d duration_ms=%d", orderHeaderID, i, end, chunkUpdated, time.Since(chunkStart).Milliseconds())
+		updated += chunkUpdated
 	}
 	return updated, nil
 }
 
+func VerifyOrderLineUpdatesTx(tx *sql.Tx, orderHeaderID string, lines []models.OrderProductionUpdateLine) (int64, []string, error) {
+	if len(lines) == 0 {
+		return 0, nil, nil
+	}
+
+	const chunkSize = 300
+	var mismatchCount int64
+	samples := make([]string, 0, 5)
+
+	for i := 0; i < len(lines); i += chunkSize {
+		end := i + chunkSize
+		if end > len(lines) {
+			end = len(lines)
+		}
+		chunk := lines[i:end]
+
+		values := make([]string, 0, len(chunk))
+		args := make([]any, 0, len(chunk)*4+1)
+		paramPos := 1
+		for _, line := range chunk {
+			values = append(values, fmt.Sprintf("(@p%d,@p%d,@p%d,@p%d)", paramPos, paramPos+1, paramPos+2, paramPos+3))
+			args = append(args,
+				strings.TrimSpace(line.OrderLineID),
+				strings.ToUpper(strings.TrimSpace(line.NewItemCode)),
+				strings.ToUpper(strings.TrimSpace(line.NewColor)),
+				strings.ToUpper(strings.TrimSpace(line.NewDim2)),
+			)
+			paramPos += 4
+		}
+		orderHeaderParam := paramPos
+		args = append(args, orderHeaderID)
+
+		query := fmt.Sprintf(`
+SET NOCOUNT ON;
+
+WITH src (OrderLineID, NewItemCode, NewColor, NewDim2) AS (
+	SELECT *
+	FROM (VALUES %s) v(OrderLineID, NewItemCode, NewColor, NewDim2)
+)
+SELECT
+	s.OrderLineID,
+	ISNULL(UPPER(LTRIM(RTRIM(l.ItemCode))), '') AS ActualItemCode,
+	ISNULL(UPPER(LTRIM(RTRIM(l.ColorCode))), '') AS ActualColorCode,
+	ISNULL(UPPER(LTRIM(RTRIM(l.ItemDim2Code))), '') AS ActualDim2Code,
+	s.NewItemCode,
+	s.NewColor,
+	s.NewDim2
+FROM src s
+JOIN dbo.trOrderLine l
+	ON l.OrderLineID = CONVERT(UNIQUEIDENTIFIER, s.OrderLineID)
+WHERE l.OrderHeaderID = CONVERT(UNIQUEIDENTIFIER, @p%d)
+  AND (
+	ISNULL(UPPER(LTRIM(RTRIM(l.ItemCode))), '') <> s.NewItemCode OR
+	ISNULL(UPPER(LTRIM(RTRIM(l.ColorCode))), '') <> s.NewColor OR
+	ISNULL(UPPER(LTRIM(RTRIM(l.ItemDim2Code))), '') <> s.NewDim2
+  );
+`, strings.Join(values, ","), orderHeaderParam)
+
+		rows, err := tx.Query(query, args...)
+		if err != nil {
+			return mismatchCount, samples, err
+		}
+		for rows.Next() {
+			var lineID, actualItem, actualColor, actualDim2, expectedItem, expectedColor, expectedDim2 string
+			if err := rows.Scan(&lineID, &actualItem, &actualColor, &actualDim2, &expectedItem, &expectedColor, &expectedDim2); err != nil {
+				rows.Close()
+				return mismatchCount, samples, err
+			}
+			mismatchCount++
+			if len(samples) < 5 {
+				samples = append(samples, fmt.Sprintf(
+					"lineID=%s expected=(%s,%s,%s) actual=(%s,%s,%s)",
+					lineID, expectedItem, expectedColor, expectedDim2, actualItem, actualColor, actualDim2,
+				))
+			}
+		}
+		if err := rows.Err(); err != nil {
+			rows.Close()
+			return mismatchCount, samples, err
+		}
+		rows.Close()
+	}
+
+	return mismatchCount, samples, nil
+}
+
 func UpdateOrderHeaderAverageDueDateTx(tx *sql.Tx, orderHeaderID string, averageDueDate *string, username string) error {
 	if averageDueDate == nil {
 		return nil
@@ -618,6 +707,24 @@ WHERE OrderHeaderID = @p3;
 	return err
 }
 
+func TouchOrderHeaderTx(tx *sql.Tx, orderHeaderID string, username string) (int64, error) {
+	res, err := tx.Exec(`
+UPDATE dbo.trOrderHeader
+SET
+	LastUpdatedUserName = @p1,
+	LastUpdatedDate = GETDATE()
+WHERE OrderHeaderID = @p2;
+`, username, orderHeaderID)
+	if err != nil {
+		return 0, err
+	}
+	rows, rowsErr := res.RowsAffected()
+	if rowsErr != nil {
+		return 0, nil
+	}
+	return rows, nil
+}
+
 type sqlQueryRower interface {
 	QueryRow(query string, args ...any) *sql.Row
 }
@@ -849,83 +956,10 @@ func InsertItemBarcodesTx(tx *sql.Tx, orderHeaderID string, lines []models.Order
 		return 0, nil
 	}
 
-	const chunkSize = 900
 	var inserted int64
 
-	for i := 0; i < len(lineIDs); i += chunkSize {
-
-		end := i + chunkSize
-		if end > len(lineIDs) {
-			end = len(lineIDs)
-		}
-
-		chunk := lineIDs[i:end]
-
-		values := make([]string, 0, len(chunk))
-		args := make([]any, 0, len(chunk)+2)
-
-		paramPos := 1
-
-		for _, lineID := range chunk {
-			values = append(values, fmt.Sprintf("(@p%d)", paramPos))
-			args = append(args, lineID)
-			paramPos++
-		}
-
-		orderHeaderParam := paramPos
-		usernameParam := paramPos + 1
-
-		args = append(args, orderHeaderID, username)
-
-		query := fmt.Sprintf(`
-SET NOCOUNT ON
-;
-
-WITH srcLine (OrderLineID) AS (
-	SELECT *
-	FROM (VALUES %s) v(OrderLineID)
-),
-
-src AS (
-	SELECT DISTINCT
-		l.ItemTypeCode,
-		UPPER(LTRIM(RTRIM(ISNULL(l.ItemCode,'')))) ItemCode,
-		UPPER(LTRIM(RTRIM(ISNULL(l.ColorCode,'')))) ColorCode,
-		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim1Code,'')))) ItemDim1Code,
-		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim2Code,'')))) ItemDim2Code,
-		CAST('' AS NVARCHAR(50)) ItemDim3Code
-	FROM dbo.trOrderLine l
-	JOIN srcLine s
-		ON CAST(l.OrderLineID AS NVARCHAR(50)) = s.OrderLineID
-	WHERE l.OrderHeaderID = @p%d
-	AND NULLIF(LTRIM(RTRIM(ISNULL(l.ItemCode,''))), '') IS NOT NULL
-),
-
-missing AS (
-	SELECT
-		s.*,
-		ROW_NUMBER() OVER (
-			ORDER BY
-				s.ItemCode,
-				s.ColorCode,
-				s.ItemDim1Code,
-				s.ItemDim2Code,
-				s.ItemDim3Code
-		) RowNo
-	FROM src s
-	WHERE NOT EXISTS (
-		SELECT 1
-		FROM dbo.prItemBarcode b
-		WHERE b.BarcodeTypeCode = 'BAGGI3'
-		AND b.UnitOfMeasureCode = 'AD'
-		AND b.ItemTypeCode = s.ItemTypeCode
-		AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemCode,'')))) = s.ItemCode
-		AND UPPER(LTRIM(RTRIM(ISNULL(b.ColorCode,'')))) = s.ColorCode
-		AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim1Code,'')))) = s.ItemDim1Code
-		AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim2Code,'')))) = s.ItemDim2Code
-		AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim3Code,'')))) = s.ItemDim3Code
-	)
-)
+	singleLineQuery := `
+SET NOCOUNT ON;
 
 INSERT INTO dbo.prItemBarcode
 (
@@ -945,16 +979,147 @@ INSERT INTO dbo.prItemBarcode
 	LastUpdatedDate,
 	RowGuid
 )
-
 SELECT
-	CAST(seed.MaxBarcode + m.RowNo AS NVARCHAR(50)),
+	CAST(seed.MaxBarcode + 1 AS NVARCHAR(50)),
 	'BAGGI3',
-	m.ItemTypeCode,
-	m.ItemCode,
-	m.ColorCode,
-	m.ItemDim1Code,
-	m.ItemDim2Code,
-	m.ItemDim3Code,
+	src.ItemTypeCode,
+	src.ItemCode,
+	src.ColorCode,
+	src.ItemDim1Code,
+	src.ItemDim2Code,
+	src.ItemDim3Code,
+	'AD',
+	1,
+	@p3,
+	GETDATE(),
+	@p3,
+	GETDATE(),
+	NEWID()
+FROM (
+	SELECT DISTINCT
+		l.ItemTypeCode,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemCode,'')))) AS ItemCode,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ColorCode,'')))) AS ColorCode,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim1Code,'')))) AS ItemDim1Code,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim2Code,'')))) AS ItemDim2Code,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim3Code,'')))) AS ItemDim3Code
+	FROM dbo.trOrderLine l
+	WHERE l.OrderHeaderID = @p2
+	  AND CAST(l.OrderLineID AS NVARCHAR(50)) = @p1
+	  AND NULLIF(LTRIM(RTRIM(ISNULL(l.ItemCode,''))), '') IS NOT NULL
+) src
+CROSS JOIN (
+	SELECT
+		CASE
+			WHEN ISNULL(MAX(
+				CASE
+					WHEN LTRIM(RTRIM(ISNULL(Barcode,''))) NOT LIKE '%%[^0-9]%%'
+						AND LEN(LTRIM(RTRIM(ISNULL(Barcode,'')))) BETWEEN 1 AND 18
+					THEN CAST(LTRIM(RTRIM(ISNULL(Barcode,''))) AS BIGINT)
+					ELSE NULL
+				END
+			), 0) < 36999999
+			THEN 36999999
+			ELSE ISNULL(MAX(
+				CASE
+					WHEN LTRIM(RTRIM(ISNULL(Barcode,''))) NOT LIKE '%%[^0-9]%%'
+						AND LEN(LTRIM(RTRIM(ISNULL(Barcode,'')))) BETWEEN 1 AND 18
+					THEN CAST(LTRIM(RTRIM(ISNULL(Barcode,''))) AS BIGINT)
+					ELSE NULL
+				END
+			), 0)
+		END AS MaxBarcode
+	FROM dbo.prItemBarcode
+	WHERE BarcodeTypeCode = 'BAGGI3'
+	  AND LEN(LTRIM(RTRIM(ISNULL(Barcode,'')))) <= 8
+) seed
+WHERE NOT EXISTS (
+	SELECT 1
+	FROM dbo.prItemBarcode b
+	WHERE b.ItemTypeCode = src.ItemTypeCode
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemCode,'')))) = src.ItemCode
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ColorCode,'')))) = src.ColorCode
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim1Code,'')))) = src.ItemDim1Code
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim2Code,'')))) = src.ItemDim2Code
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim3Code,'')))) = src.ItemDim3Code
+);
+`
+
+	execSingle := func(globalIndex int, lineID string) error {
+		lineStart := time.Now()
+		res, err := tx.Exec(singleLineQuery, lineID, orderHeaderID, username)
+		if err != nil {
+			if isDuplicateBarcodeInsertErr(err) {
+				log.Printf("[InsertItemBarcodesTx] skip duplicate lineIndex=%d lineID=%s err=%v", globalIndex, lineID, err)
+				return nil
+			}
+			return fmt.Errorf("upsert item barcodes chunk failed chunkStart=%d chunkEnd=%d duration_ms=%d: %w", globalIndex, globalIndex+1, time.Since(lineStart).Milliseconds(), err)
+		}
+		rows, _ := res.RowsAffected()
+		inserted += rows
+		log.Printf(
+			"[InsertItemBarcodesTx] lineIndex=%d lineID=%s inserted=%d cumulative=%d duration_ms=%d",
+			globalIndex,
+			lineID,
+			rows,
+			inserted,
+			time.Since(lineStart).Milliseconds(),
+		)
+		return nil
+	}
+
+	const chunkSize = 200
+	for i := 0; i < len(lineIDs); i += chunkSize {
+		end := i + chunkSize
+		if end > len(lineIDs) {
+			end = len(lineIDs)
+		}
+
+		chunk := lineIDs[i:end]
+		values := make([]string, 0, len(chunk))
+		args := make([]any, 0, len(chunk)+2)
+		paramPos := 1
+		for _, lineID := range chunk {
+			values = append(values, fmt.Sprintf("(@p%d)", paramPos))
+			args = append(args, lineID)
+			paramPos++
+		}
+		orderHeaderParam := paramPos
+		usernameParam := paramPos + 1
+		args = append(args, orderHeaderID, username)
+
+		batchQuery := fmt.Sprintf(`
+SET NOCOUNT ON;
+
+INSERT INTO dbo.prItemBarcode
+(
+	Barcode,
+	BarcodeTypeCode,
+	ItemTypeCode,
+	ItemCode,
+	ColorCode,
+	ItemDim1Code,
+	ItemDim2Code,
+	ItemDim3Code,
+	UnitOfMeasureCode,
+	Qty,
+	CreatedUserName,
+	CreatedDate,
+	LastUpdatedUserName,
+	LastUpdatedDate,
+	RowGuid
+)
+SELECT
+	CAST(seed.MaxBarcode + ROW_NUMBER() OVER (
+		ORDER BY src.ItemTypeCode, src.ItemCode, src.ColorCode, src.ItemDim1Code, src.ItemDim2Code, src.ItemDim3Code
+	) AS NVARCHAR(50)),
+	'BAGGI3',
+	src.ItemTypeCode,
+	src.ItemCode,
+	src.ColorCode,
+	src.ItemDim1Code,
+	src.ItemDim2Code,
+	src.ItemDim3Code,
 	'AD',
 	1,
 	@p%d,
@@ -962,42 +1127,80 @@ SELECT
 	@p%d,
 	GETDATE(),
 	NEWID()
-
-FROM missing m
-
+FROM (
+	SELECT DISTINCT
+		l.ItemTypeCode,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemCode,'')))) AS ItemCode,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ColorCode,'')))) AS ColorCode,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim1Code,'')))) AS ItemDim1Code,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim2Code,'')))) AS ItemDim2Code,
+		UPPER(LTRIM(RTRIM(ISNULL(l.ItemDim3Code,'')))) AS ItemDim3Code
+	FROM dbo.trOrderLine l
+	JOIN (VALUES %s) ids(OrderLineID)
+	  ON CAST(l.OrderLineID AS NVARCHAR(50)) = ids.OrderLineID
+	WHERE l.OrderHeaderID = @p%d
+	  AND NULLIF(LTRIM(RTRIM(ISNULL(l.ItemCode,''))), '') IS NOT NULL
+) src
 CROSS JOIN (
-	SELECT ISNULL(MAX(
+	SELECT
 		CASE
-			WHEN ISNUMERIC(Barcode)=1
-			THEN CAST(Barcode AS BIGINT)
-			ELSE NULL
-		END
-	),0) AS MaxBarcode
+			WHEN ISNULL(MAX(
+				CASE
+					WHEN LTRIM(RTRIM(ISNULL(Barcode,''))) NOT LIKE '%%[^0-9]%%'
+						AND LEN(LTRIM(RTRIM(ISNULL(Barcode,'')))) BETWEEN 1 AND 18
+					THEN CAST(LTRIM(RTRIM(ISNULL(Barcode,''))) AS BIGINT)
+					ELSE NULL
+				END
+			), 0) < 36999999
+			THEN 36999999
+			ELSE ISNULL(MAX(
+				CASE
+					WHEN LTRIM(RTRIM(ISNULL(Barcode,''))) NOT LIKE '%%[^0-9]%%'
+						AND LEN(LTRIM(RTRIM(ISNULL(Barcode,'')))) BETWEEN 1 AND 18
+					THEN CAST(LTRIM(RTRIM(ISNULL(Barcode,''))) AS BIGINT)
+					ELSE NULL
+				END
+			), 0)
+		END AS MaxBarcode
 	FROM dbo.prItemBarcode
+	WHERE BarcodeTypeCode = 'BAGGI3'
+	  AND LEN(LTRIM(RTRIM(ISNULL(Barcode,'')))) <= 8
 ) seed
-`, strings.Join(values, ","), orderHeaderParam, usernameParam, usernameParam)
+WHERE NOT EXISTS (
+	SELECT 1
+	FROM dbo.prItemBarcode b
+	WHERE b.ItemTypeCode = src.ItemTypeCode
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemCode,'')))) = src.ItemCode
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ColorCode,'')))) = src.ColorCode
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim1Code,'')))) = src.ItemDim1Code
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim2Code,'')))) = src.ItemDim2Code
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim3Code,'')))) = src.ItemDim3Code
+);
+`, usernameParam, usernameParam, strings.Join(values, ","), orderHeaderParam)
 
 		chunkStart := time.Now()
-
-		res, err := tx.Exec(query, args...)
-
-		if err != nil {
-			log.Printf("[InsertItemBarcodesTx] ERROR chunk=%d-%d err=%v", i, end, err)
-			return inserted, err
+		res, err := tx.Exec(batchQuery, args...)
+		if err == nil {
+			rows, _ := res.RowsAffected()
+			inserted += rows
+			log.Printf(
+				"[InsertItemBarcodesTx] batch=%d-%d inserted=%d cumulative=%d duration_ms=%d",
+				i,
+				end,
+				rows,
+				inserted,
+				time.Since(chunkStart).Milliseconds(),
+			)
+			continue
 		}
 
-		rows, _ := res.RowsAffected()
-
-		inserted += rows
-
-		log.Printf(
-			"[InsertItemBarcodesTx] chunk=%d-%d inserted=%d cumulative=%d duration_ms=%d",
-			i,
-			end,
-			rows,
-			inserted,
-			time.Since(chunkStart).Milliseconds(),
-		)
+		log.Printf("[InsertItemBarcodesTx] batch fallback=%d-%d err=%v", i, end, err)
+		for j, lineID := range chunk {
+			if lineErr := execSingle(i+j, lineID); lineErr != nil {
+				log.Printf("[InsertItemBarcodesTx] ERROR lineIndex=%d lineID=%s err=%v", i+j, lineID, lineErr)
+				return inserted, lineErr
+			}
+		}
 	}
 
 	log.Printf(
@@ -1011,6 +1214,289 @@ CROSS JOIN (
 	return inserted, nil
 }
 
+func InsertItemBarcodesByTargetsTx(tx *sql.Tx, targets []models.OrderProductionMissingVariant, username string) (int64, error) {
+	start := time.Now()
+	if len(targets) == 0 {
+		log.Printf("[InsertItemBarcodesByTargetsTx] targets=0 inserted=0 duration_ms=0")
+		return 0, nil
+	}
+
+	uniqueTargets := make([]models.OrderProductionMissingVariant, 0, len(targets))
+	seen := make(map[string]struct{}, len(targets))
+	for _, t := range targets {
+		itemCode := strings.ToUpper(strings.TrimSpace(t.ItemCode))
+		if itemCode == "" {
+			continue
+		}
+		key := fmt.Sprintf("%d|%s|%s|%s|%s|%s",
+			t.ItemTypeCode,
+			itemCode,
+			strings.ToUpper(strings.TrimSpace(t.ColorCode)),
+			strings.ToUpper(strings.TrimSpace(t.ItemDim1Code)),
+			strings.ToUpper(strings.TrimSpace(t.ItemDim2Code)),
+			strings.ToUpper(strings.TrimSpace(t.ItemDim3Code)),
+		)
+		if _, ok := seen[key]; ok {
+			continue
+		}
+		seen[key] = struct{}{}
+		t.ItemCode = itemCode
+		t.ColorCode = strings.ToUpper(strings.TrimSpace(t.ColorCode))
+		t.ItemDim1Code = strings.ToUpper(strings.TrimSpace(t.ItemDim1Code))
+		t.ItemDim2Code = strings.ToUpper(strings.TrimSpace(t.ItemDim2Code))
+		t.ItemDim3Code = strings.ToUpper(strings.TrimSpace(t.ItemDim3Code))
+		uniqueTargets = append(uniqueTargets, t)
+	}
+
+	if len(uniqueTargets) == 0 {
+		log.Printf("[InsertItemBarcodesByTargetsTx] targets=%d unique=0 inserted=0 duration_ms=%d", len(targets), time.Since(start).Milliseconds())
+		return 0, nil
+	}
+	if err := ensureTxStillActive(tx, "InsertItemBarcodesByTargetsTx/start"); err != nil {
+		return 0, err
+	}
+
+	// Barcode seed'i hem prItemBarcode hem de (varsa) tbStokBarkodu uzerinden
+	// kilitli okuyarak hesapla; trigger tarafindaki duplicate riskini azalt.
+	var maxBarcode int64
+	maxPrQuery := `
+SELECT ISNULL(MAX(v.BarcodeNum), 0)
+FROM (
+	SELECT
+		CASE
+			WHEN LTRIM(RTRIM(ISNULL(pb.Barcode,''))) NOT LIKE '%[^0-9]%'
+			     AND LEN(LTRIM(RTRIM(ISNULL(pb.Barcode,'')))) BETWEEN 1 AND 18
+			THEN CAST(LTRIM(RTRIM(ISNULL(pb.Barcode,''))) AS BIGINT)
+			ELSE NULL
+		END AS BarcodeNum
+	FROM dbo.prItemBarcode pb WITH (UPDLOCK, HOLDLOCK, TABLOCKX)
+	WHERE pb.BarcodeTypeCode = 'BAGGI3'
+) v
+WHERE v.BarcodeNum IS NOT NULL;
+`
+	if err := tx.QueryRow(maxPrQuery).Scan(&maxBarcode); err != nil {
+		return 0, fmt.Errorf("barcode seed query failed: %w", err)
+	}
+	var hasTb int
+	if err := tx.QueryRow(`SELECT CASE WHEN OBJECT_ID(N'dbo.tbStokBarkodu', N'U') IS NULL THEN 0 ELSE 1 END`).Scan(&hasTb); err != nil {
+		return 0, fmt.Errorf("barcode seed object check failed: %w", err)
+	}
+	if hasTb == 1 {
+		var maxTb int64
+		maxTbQuery := `
+SELECT ISNULL(MAX(v.BarcodeNum), 0)
+FROM (
+	SELECT
+		CASE
+			WHEN LTRIM(RTRIM(ISNULL(sb.Barcode,''))) NOT LIKE '%[^0-9]%'
+			     AND LEN(LTRIM(RTRIM(ISNULL(sb.Barcode,'')))) BETWEEN 1 AND 18
+			THEN CAST(LTRIM(RTRIM(ISNULL(sb.Barcode,''))) AS BIGINT)
+			ELSE NULL
+		END AS BarcodeNum
+	FROM dbo.tbStokBarkodu sb WITH (UPDLOCK, HOLDLOCK, TABLOCKX)
+) v
+WHERE v.BarcodeNum IS NOT NULL;
+`
+		if err := tx.QueryRow(maxTbQuery).Scan(&maxTb); err != nil {
+			return 0, fmt.Errorf("barcode seed tbStokBarkodu query failed: %w", err)
+		}
+		if maxTb > maxBarcode {
+			maxBarcode = maxTb
+		}
+	}
+	if maxBarcode < 36999999 {
+		maxBarcode = 36999999
+	}
+	existsBarcodeQuery := `
+SELECT CASE WHEN EXISTS (
+	SELECT 1
+	FROM dbo.prItemBarcode pb WITH (UPDLOCK, HOLDLOCK)
+	WHERE LTRIM(RTRIM(ISNULL(pb.Barcode,''))) = @p1
+) THEN 1 ELSE 0 END;
+`
+	existsBarcodeWithTbQuery := `
+SELECT CASE WHEN EXISTS (
+	SELECT 1
+	FROM dbo.prItemBarcode pb WITH (UPDLOCK, HOLDLOCK)
+	WHERE LTRIM(RTRIM(ISNULL(pb.Barcode,''))) = @p1
+) OR EXISTS (
+	SELECT 1
+	FROM dbo.tbStokBarkodu sb WITH (UPDLOCK, HOLDLOCK)
+	WHERE LTRIM(RTRIM(ISNULL(sb.Barcode,''))) = @p1
+) THEN 1 ELSE 0 END;
+`
+	hasVariantBarcodeQuery := `
+SELECT CASE WHEN EXISTS (
+	SELECT 1
+	FROM dbo.prItemBarcode b WITH (UPDLOCK, HOLDLOCK)
+	WHERE b.ItemTypeCode = @p1
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemCode,'')))) = @p2
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ColorCode,'')))) = @p3
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim1Code,'')))) = @p4
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim2Code,'')))) = @p5
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim3Code,'')))) = @p6
+) THEN 1 ELSE 0 END;
+`
+	insertOneQuery := `
+INSERT INTO dbo.prItemBarcode
+(
+	Barcode,
+	BarcodeTypeCode,
+	ItemTypeCode,
+	ItemCode,
+	ColorCode,
+	ItemDim1Code,
+	ItemDim2Code,
+	ItemDim3Code,
+	UnitOfMeasureCode,
+	Qty,
+	CreatedUserName,
+	CreatedDate,
+	LastUpdatedUserName,
+	LastUpdatedDate,
+	RowGuid
+)
+SELECT
+	@p1,
+	'BAGGI3',
+	@p2,
+	@p3,
+	@p4,
+	@p5,
+	@p6,
+	@p7,
+	'AD',
+	1,
+	@p8,
+	GETDATE(),
+	@p8,
+	GETDATE(),
+	NEWID()
+WHERE NOT EXISTS (
+	SELECT 1
+	FROM dbo.prItemBarcode b
+	WHERE b.ItemTypeCode = @p2
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemCode,'')))) = @p3
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ColorCode,'')))) = @p4
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim1Code,'')))) = @p5
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim2Code,'')))) = @p6
+	  AND UPPER(LTRIM(RTRIM(ISNULL(b.ItemDim3Code,'')))) = @p7
+);
+`
+
+	var inserted int64
+	for _, t := range uniqueTargets {
+		if err := ensureTxStillActive(tx, "InsertItemBarcodesByTargetsTx/before_target"); err != nil {
+			return inserted, err
+		}
+		var hasVariant int
+		if err := tx.QueryRow(
+			hasVariantBarcodeQuery,
+			t.ItemTypeCode,
+			t.ItemCode,
+			t.ColorCode,
+			t.ItemDim1Code,
+			t.ItemDim2Code,
+			t.ItemDim3Code,
+		).Scan(&hasVariant); err != nil {
+			return inserted, fmt.Errorf("variant barcode exists check failed: %w", err)
+		}
+		if hasVariant == 1 {
+			continue
+		}
+
+		retry := 0
+		for {
+			retry++
+			if retry > 2000 {
+				return inserted, fmt.Errorf("barcode allocation exceeded retry limit item=%s color=%s dim1=%s", t.ItemCode, t.ColorCode, t.ItemDim1Code)
+			}
+			candidateNum := maxBarcode + 1
+			candidate := strconv.FormatInt(candidateNum, 10)
+
+			var exists int
+			if hasTb == 1 {
+				if err := tx.QueryRow(existsBarcodeWithTbQuery, candidate).Scan(&exists); err != nil {
+					return inserted, fmt.Errorf("barcode exists check(tb) failed: %w", err)
+				}
+			} else {
+				if err := tx.QueryRow(existsBarcodeQuery, candidate).Scan(&exists); err != nil {
+					return inserted, fmt.Errorf("barcode exists check failed: %w", err)
+				}
+			}
+			if exists == 1 {
+				maxBarcode = candidateNum
+				continue
+			}
+
+			res, err := tx.Exec(
+				insertOneQuery,
+				candidate,
+				t.ItemTypeCode,
+				t.ItemCode,
+				t.ColorCode,
+				t.ItemDim1Code,
+				t.ItemDim2Code,
+				t.ItemDim3Code,
+				username,
+			)
+			if err != nil {
+				if isDuplicateBarcodeInsertErr(err) {
+					maxBarcode = candidateNum
+					continue
+				}
+				return inserted, fmt.Errorf("insert item barcode failed item=%s color=%s dim1=%s duration_ms=%d: %w",
+					t.ItemCode, t.ColorCode, t.ItemDim1Code, time.Since(start).Milliseconds(), err)
+			}
+			affected, _ := res.RowsAffected()
+			if affected > 0 {
+				inserted += affected
+				maxBarcode = candidateNum
+			}
+			break
+		}
+	}
+
+	if txErr := ensureTxStillActive(tx, "InsertItemBarcodesByTargetsTx/after_batch"); txErr != nil {
+		return inserted, txErr
+	}
+
+	log.Printf("[InsertItemBarcodesByTargetsTx] targets=%d unique=%d inserted=%d duration_ms=%d",
+		len(targets), len(uniqueTargets), inserted, time.Since(start).Milliseconds())
+	return inserted, nil
+}
+
+func ensureTxStillActive(tx *sql.Tx, where string) error {
+	if tx == nil {
+		return fmt.Errorf("tx is nil at %s", where)
+	}
+	var tranCount int
+	if err := tx.QueryRow(`SELECT @@TRANCOUNT`).Scan(&tranCount); err != nil {
+		return fmt.Errorf("tx state query failed at %s: %w", where, err)
+	}
+	if tranCount <= 0 {
+		return fmt.Errorf("tx closed unexpectedly at %s (trancount=%d)", where, tranCount)
+	}
+	return nil
+}
+
+func isDuplicateBarcodeInsertErr(err error) bool {
+	if err == nil {
+		return false
+	}
+	msg := strings.ToLower(err.Error())
+	if !strings.Contains(msg, "duplicate key") {
+		return false
+	}
+	if strings.Contains(msg, "tbstokbarkodu") {
+		return true
+	}
+	if strings.Contains(msg, "pritembarcode") {
+		return true
+	}
+	return strings.Contains(msg, "unique")
+}
+
 func UpsertItemAttributesTx(tx *sql.Tx, attrs []models.OrderProductionItemAttributeRow, username string) (int64, error) {
 	start := time.Now()
 	if len(attrs) == 0 {
@@ -1018,6 +1504,28 @@ func UpsertItemAttributesTx(tx *sql.Tx, attrs []models.OrderProductionItemAttrib
 		return 0, nil
 	}
 
+	// FK_prItemAttribute_ItemCode hatasini engellemek icin, attribute yazmadan once
+	// ilgili item kodlarinin cdItem tarafinda varligini transaction icinde garanti et.
+	seenCodes := make(map[string]struct{}, len(attrs))
+	for _, a := range attrs {
+		itemTypeCode := a.ItemTypeCode
+		if itemTypeCode <= 0 {
+			itemTypeCode = 1
+		}
+		itemCode := strings.ToUpper(strings.TrimSpace(a.ItemCode))
+		if itemCode == "" {
+			continue
+		}
+		key := NormalizeCdItemMapKey(int16(itemTypeCode), itemCode)
+		if _, ok := seenCodes[key]; ok {
+			continue
+		}
+		seenCodes[key] = struct{}{}
+		if err := ensureCdItemTx(tx, int16(itemTypeCode), itemCode, username, nil); err != nil {
+			return 0, fmt.Errorf("ensure cdItem before item attributes failed itemCode=%s: %w", itemCode, err)
+		}
+	}
+
 	// SQL Server parameter limiti (2100) nedeniyle batch'li set-based upsert kullanilir.
 	const chunkSize = 400 // 400 * 4 param + 1 username = 1601
 	var affected int64

svc/routes/orderproductionitems.go

@@ -180,16 +180,33 @@ func OrderProductionValidateRoute(mssql *sql.DB) http.Handler {
 		log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s payload lineCount=%d insertMissing=%t cdItemCount=%d attributeCount=%d",
 			rid, id, len(payload.Lines), payload.InsertMissing, len(payload.CdItems), len(payload.ProductAttributes))
 
+		newLines, existingLines := splitLinesByCdItemDraft(payload.Lines, payload.CdItems)
+		newCodes := uniqueCodesFromLines(newLines)
+		existingCodes := uniqueCodesFromLines(existingLines)
+		missing := make([]models.OrderProductionMissingVariant, 0)
+		targets := make([]models.OrderProductionMissingVariant, 0)
 		stepStart := time.Now()
-		missing, err := buildMissingVariants(mssql, id, payload.Lines)
-		if err != nil {
-			log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s step=build_missing failed duration_ms=%d err=%v",
-				rid, id, time.Since(stepStart).Milliseconds(), err)
-			writeDBError(w, http.StatusInternalServerError, "validate_missing_variants", id, "", len(payload.Lines), err)
-			return
+		if len(newLines) > 0 {
+			err := runWithTransientMSSQLRetry("validate_build_targets_missing", 3, 500*time.Millisecond, func() error {
+				var stepErr error
+				targets, stepErr = buildTargetVariants(mssql, id, newLines)
+				if stepErr != nil {
+					return stepErr
+				}
+				missing, stepErr = buildMissingVariantsFromTargets(mssql, id, targets)
+				return stepErr
+			})
+			if err != nil {
+				log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s step=build_missing failed duration_ms=%d err=%v",
+					rid, id, time.Since(stepStart).Milliseconds(), err)
+				writeDBError(w, http.StatusInternalServerError, "validate_missing_variants", id, "", len(newLines), err)
+				return
+			}
 		}
-		log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s lineCount=%d missingCount=%d build_missing_ms=%d total_ms=%d",
-			rid, id, len(payload.Lines), len(missing), time.Since(stepStart).Milliseconds(), time.Since(start).Milliseconds())
+		log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s lineCount=%d newLineCount=%d existingLineCount=%d targetVariantCount=%d missingCount=%d build_missing_ms=%d total_ms=%d",
+			rid, id, len(payload.Lines), len(newLines), len(existingLines), len(targets), len(missing), time.Since(stepStart).Milliseconds(), time.Since(start).Milliseconds())
+		log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s scope newCodes=%v existingCodes=%v",
+			rid, id, newCodes, existingCodes)
 
 		resp := map[string]any{
 			"missingCount":           len(missing),
@@ -230,17 +247,57 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
 		}
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s payload lineCount=%d insertMissing=%t cdItemCount=%d attributeCount=%d",
 			rid, id, len(payload.Lines), payload.InsertMissing, len(payload.CdItems), len(payload.ProductAttributes))
-
-		stepMissingStart := time.Now()
-		missing, err := buildMissingVariants(mssql, id, payload.Lines)
-		if err != nil {
-			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=build_missing failed duration_ms=%d err=%v",
-				rid, id, time.Since(stepMissingStart).Milliseconds(), err)
-			writeDBError(w, http.StatusInternalServerError, "apply_validate_missing_variants", id, "", len(payload.Lines), err)
-			return
+		if len(payload.Lines) > 0 {
+			limit := 5
+			if len(payload.Lines) < limit {
+				limit = len(payload.Lines)
+			}
+			samples := make([]string, 0, limit)
+			for i := 0; i < limit; i++ {
+				ln := payload.Lines[i]
+				dim1 := ""
+				if ln.ItemDim1Code != nil {
+					dim1 = strings.TrimSpace(*ln.ItemDim1Code)
+				}
+				samples = append(samples, fmt.Sprintf(
+					"lineID=%s newItem=%s newColor=%s newDim1=%s newDim2=%s",
+					strings.TrimSpace(ln.OrderLineID),
+					strings.ToUpper(strings.TrimSpace(ln.NewItemCode)),
+					strings.ToUpper(strings.TrimSpace(ln.NewColor)),
+					strings.ToUpper(strings.TrimSpace(dim1)),
+					strings.ToUpper(strings.TrimSpace(ln.NewDim2)),
+				))
+			}
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s payload lineSamples=%v", rid, id, samples)
 		}
-		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s lineCount=%d missingCount=%d build_missing_ms=%d",
-			rid, id, len(payload.Lines), len(missing), time.Since(stepMissingStart).Milliseconds())
+
+		newLines, existingLines := splitLinesByCdItemDraft(payload.Lines, payload.CdItems)
+		newCodes := uniqueCodesFromLines(newLines)
+		existingCodes := uniqueCodesFromLines(existingLines)
+		stepMissingStart := time.Now()
+		missing := make([]models.OrderProductionMissingVariant, 0)
+		barcodeTargets := make([]models.OrderProductionMissingVariant, 0)
+		if len(newLines) > 0 {
+			err := runWithTransientMSSQLRetry("apply_build_targets_missing", 3, 500*time.Millisecond, func() error {
+				var stepErr error
+				barcodeTargets, stepErr = buildTargetVariants(mssql, id, newLines)
+				if stepErr != nil {
+					return stepErr
+				}
+				missing, stepErr = buildMissingVariantsFromTargets(mssql, id, barcodeTargets)
+				return stepErr
+			})
+			if err != nil {
+				log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=build_missing failed duration_ms=%d err=%v",
+					rid, id, time.Since(stepMissingStart).Milliseconds(), err)
+				writeDBError(w, http.StatusInternalServerError, "apply_validate_missing_variants", id, "", len(newLines), err)
+				return
+			}
+		}
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s lineCount=%d newLineCount=%d existingLineCount=%d targetVariantCount=%d missingCount=%d build_missing_ms=%d",
+			rid, id, len(payload.Lines), len(newLines), len(existingLines), len(barcodeTargets), len(missing), time.Since(stepMissingStart).Milliseconds())
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s scope newCodes=%v existingCodes=%v",
+			rid, id, newCodes, existingCodes)
 
 		if len(missing) > 0 && !payload.InsertMissing {
 			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s early_exit=missing_variants total_ms=%d",
@@ -269,30 +326,83 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
 			writeDBError(w, http.StatusInternalServerError, "begin_tx", id, username, len(payload.Lines), err)
 			return
 		}
-		defer tx.Rollback()
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=begin_tx duration_ms=%d", rid, id, time.Since(stepBeginStart).Milliseconds())
+		committed := false
+		currentStep := "begin_tx"
+		applyTxSettings := func(tx *sql.Tx) error {
+			// XACT_ABORT OFF:
+			// Barcode insert path intentionally tolerates duplicate-key errors (fallback/skip duplicate).
+			// With XACT_ABORT ON, that expected error aborts the whole transaction and causes COMMIT 3902.
+			_, execErr := tx.Exec(`SET XACT_ABORT OFF; SET LOCK_TIMEOUT 15000;`)
+			return execErr
+		}
+		defer func() {
+			if committed {
+				return
+			}
+			rbStart := time.Now()
+			if rbErr := tx.Rollback(); rbErr != nil && rbErr != sql.ErrTxDone {
+				log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s rollback step=%s failed duration_ms=%d err=%v",
+					rid, id, currentStep, time.Since(rbStart).Milliseconds(), rbErr)
+				return
+			}
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s rollback step=%s ok duration_ms=%d",
+				rid, id, currentStep, time.Since(rbStart).Milliseconds())
+		}()
 
 		stepTxSettingsStart := time.Now()
-		if _, err := tx.Exec(`SET XACT_ABORT ON; SET LOCK_TIMEOUT 15000;`); err != nil {
+		currentStep = "tx_settings"
+		if err := applyTxSettings(tx); err != nil {
 			writeDBError(w, http.StatusInternalServerError, "tx_settings", id, username, len(payload.Lines), err)
 			return
 		}
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=tx_settings duration_ms=%d", rid, id, time.Since(stepTxSettingsStart).Milliseconds())
+		if err := ensureTxAlive(tx, "after_tx_settings"); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_tx_settings", id, username, len(payload.Lines), err)
+			return
+		}
 
 		var inserted int64
-		if payload.InsertMissing {
+		if payload.InsertMissing && len(newLines) > 0 {
+			currentStep = "insert_missing_variants"
 			cdItemByCode := buildCdItemDraftMap(payload.CdItems)
 			stepInsertMissingStart := time.Now()
 			inserted, err = queries.InsertMissingVariantsTx(tx, missing, username, cdItemByCode)
+			if err != nil && isTransientMSSQLNetworkErr(err) {
+				log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=insert_missing transient_error retry=1 err=%v",
+					rid, id, err)
+				_ = tx.Rollback()
+				tx, err = mssql.Begin()
+				if err != nil {
+					writeDBError(w, http.StatusInternalServerError, "begin_tx_retry_insert_missing", id, username, len(payload.Lines), err)
+					return
+				}
+				currentStep = "tx_settings_retry_insert_missing"
+				if err = applyTxSettings(tx); err != nil {
+					writeDBError(w, http.StatusInternalServerError, "tx_settings_retry_insert_missing", id, username, len(payload.Lines), err)
+					return
+				}
+				if err = ensureTxAlive(tx, "after_tx_settings_retry_insert_missing"); err != nil {
+					writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_tx_settings_retry_insert_missing", id, username, len(payload.Lines), err)
+					return
+				}
+				currentStep = "insert_missing_variants_retry"
+				inserted, err = queries.InsertMissingVariantsTx(tx, missing, username, cdItemByCode)
+			}
 			if err != nil {
 				writeDBError(w, http.StatusInternalServerError, "insert_missing_variants", id, username, len(missing), err)
 				return
 			}
+			if err := ensureTxAlive(tx, "after_insert_missing_variants"); err != nil {
+				writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_insert_missing_variants", id, username, len(missing), err)
+				return
+			}
 			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=insert_missing inserted=%d duration_ms=%d",
 				rid, id, inserted, time.Since(stepInsertMissingStart).Milliseconds())
 		}
 
 		stepValidateAttrStart := time.Now()
+		currentStep = "validate_attributes"
 		if err := validateProductAttributes(payload.ProductAttributes); err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
@@ -300,37 +410,8 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=validate_attributes count=%d duration_ms=%d",
 			rid, id, len(payload.ProductAttributes), time.Since(stepValidateAttrStart).Milliseconds())
 
-		stepUpdateHeaderStart := time.Now()
-		if err := queries.UpdateOrderHeaderAverageDueDateTx(tx, id, payload.HeaderAverageDueDate, username); err != nil {
-			writeDBError(w, http.StatusInternalServerError, "update_order_header_average_due_date", id, username, 0, err)
-			return
-		}
-		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=update_header_average_due_date changed=%t duration_ms=%d",
-			rid, id, payload.HeaderAverageDueDate != nil, time.Since(stepUpdateHeaderStart).Milliseconds())
-
-		stepUpdateLinesStart := time.Now()
-		updated, err := queries.UpdateOrderLinesTx(tx, id, payload.Lines, username)
-		if err != nil {
-			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=update_lines failed duration_ms=%d err=%v",
-				rid, id, time.Since(stepUpdateLinesStart).Milliseconds(), err)
-			writeDBError(w, http.StatusInternalServerError, "update_order_lines", id, username, len(payload.Lines), err)
-			return
-		}
-		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=update_lines updated=%d duration_ms=%d",
-			rid, id, updated, time.Since(stepUpdateLinesStart).Milliseconds())
-
-		stepUpsertBarcodeStart := time.Now()
-		barcodeInserted, err := queries.InsertItemBarcodesTx(tx, id, payload.Lines, username)
-		if err != nil {
-			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_barcodes failed duration_ms=%d err=%v",
-				rid, id, time.Since(stepUpsertBarcodeStart).Milliseconds(), err)
-			writeDBError(w, http.StatusInternalServerError, "upsert_item_barcodes", id, username, len(payload.Lines), err)
-			return
-		}
-		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_barcodes inserted=%d duration_ms=%d",
-			rid, id, barcodeInserted, time.Since(stepUpsertBarcodeStart).Milliseconds())
-
 		stepUpsertAttrStart := time.Now()
+		currentStep = "upsert_item_attributes"
 		attributeAffected, err := queries.UpsertItemAttributesTx(tx, payload.ProductAttributes, username)
 		if err != nil {
 			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_attributes failed duration_ms=%d err=%v",
@@ -340,14 +421,120 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
 		}
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_attributes affected=%d duration_ms=%d",
 			rid, id, attributeAffected, time.Since(stepUpsertAttrStart).Milliseconds())
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s table=prItemAttribute inputRows=%d affectedRows=%d",
+			rid, id, len(payload.ProductAttributes), attributeAffected)
+		if err := ensureTxAlive(tx, "after_upsert_item_attributes"); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_upsert_item_attributes", id, username, len(payload.ProductAttributes), err)
+			return
+		}
+
+		var barcodeInserted int64
+		// Barkod adimi:
+		// - Eski kodlara girmemeli
+		// - Yeni kod satirlari icin, varyant daha once olusmus olsa bile eksik barkod varsa tamamlamali
+		// Bu nedenle "inserted > 0" yerine "newLineCount > 0" kosulu kullanilir.
+		if len(newLines) > 0 && len(barcodeTargets) > 0 {
+			stepUpsertBarcodeStart := time.Now()
+			currentStep = "upsert_item_barcodes"
+			barcodeInserted, err = queries.InsertItemBarcodesByTargetsTx(tx, barcodeTargets, username)
+			if err != nil {
+				log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_barcodes failed duration_ms=%d err=%v",
+					rid, id, time.Since(stepUpsertBarcodeStart).Milliseconds(), err)
+				writeDBError(w, http.StatusInternalServerError, "upsert_item_barcodes", id, username, len(barcodeTargets), err)
+				return
+			}
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_barcodes inserted=%d duration_ms=%d",
+				rid, id, barcodeInserted, time.Since(stepUpsertBarcodeStart).Milliseconds())
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s table=prItemBarcode targetVariantRows=%d insertedRows=%d",
+				rid, id, len(barcodeTargets), barcodeInserted)
+			if err := ensureTxAlive(tx, "after_upsert_item_barcodes"); err != nil {
+				writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_upsert_item_barcodes", id, username, len(barcodeTargets), err)
+				return
+			}
+		} else {
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=upsert_barcodes skipped newLineCount=%d targetVariantRows=%d",
+				rid, id, len(newLines), len(barcodeTargets))
+		}
+
+		stepUpdateHeaderStart := time.Now()
+		currentStep = "update_order_header_average_due_date"
+		if err := queries.UpdateOrderHeaderAverageDueDateTx(tx, id, payload.HeaderAverageDueDate, username); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "update_order_header_average_due_date", id, username, 0, err)
+			return
+		}
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=update_header_average_due_date changed=%t duration_ms=%d",
+			rid, id, payload.HeaderAverageDueDate != nil, time.Since(stepUpdateHeaderStart).Milliseconds())
+		if err := ensureTxAlive(tx, "after_update_order_header_average_due_date"); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_update_order_header_average_due_date", id, username, 0, err)
+			return
+		}
+
+		currentStep = "touch_order_header"
+		headerTouched, err := queries.TouchOrderHeaderTx(tx, id, username)
+		if err != nil {
+			writeDBError(w, http.StatusInternalServerError, "touch_order_header", id, username, len(payload.Lines), err)
+			return
+		}
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s table=trOrderHeader touchedRows=%d",
+			rid, id, headerTouched)
+		if err := ensureTxAlive(tx, "after_touch_order_header"); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_touch_order_header", id, username, len(payload.Lines), err)
+			return
+		}
+
+		stepUpdateLinesStart := time.Now()
+		currentStep = "update_order_lines"
+		updated, err := queries.UpdateOrderLinesTx(tx, id, payload.Lines, username)
+		if err != nil {
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=update_lines failed duration_ms=%d err=%v",
+				rid, id, time.Since(stepUpdateLinesStart).Milliseconds(), err)
+			writeDBError(w, http.StatusInternalServerError, "update_order_lines", id, username, len(payload.Lines), err)
+			return
+		}
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=update_lines updated=%d duration_ms=%d",
+			rid, id, updated, time.Since(stepUpdateLinesStart).Milliseconds())
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s table=trOrderLine targetRows=%d updatedRows=%d",
+			rid, id, len(payload.Lines), updated)
+		if err := ensureTxAlive(tx, "after_update_order_lines"); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "tx_not_active_after_update_order_lines", id, username, len(payload.Lines), err)
+			return
+		}
+
+		currentStep = "verify_order_lines"
+		verifyMismatchCount, verifySamples, verifyErr := queries.VerifyOrderLineUpdatesTx(tx, id, payload.Lines)
+		if verifyErr != nil {
+			writeDBError(w, http.StatusInternalServerError, "verify_order_lines", id, username, len(payload.Lines), verifyErr)
+			return
+		}
+		if verifyMismatchCount > 0 {
+			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s table=trOrderLine verifyMismatchCount=%d samples=%v",
+				rid, id, verifyMismatchCount, verifySamples)
+			currentStep = "verify_order_lines_mismatch"
+			w.WriteHeader(http.StatusInternalServerError)
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"message": "Order satirlari beklenen kod/renk degerlerine guncellenemedi",
+				"step":    "verify_order_lines_mismatch",
+				"detail":  fmt.Sprintf("mismatchCount=%d", verifyMismatchCount),
+				"samples": verifySamples,
+			})
+			return
+		}
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s table=trOrderLine verifyMismatchCount=0",
+			rid, id)
+		if err := ensureTxAlive(tx, "before_commit_tx"); err != nil {
+			writeDBError(w, http.StatusInternalServerError, "tx_not_active_before_commit_tx", id, username, len(payload.Lines), err)
+			return
+		}
 
 		stepCommitStart := time.Now()
+		currentStep = "commit_tx"
 		if err := tx.Commit(); err != nil {
 			log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=commit failed duration_ms=%d err=%v",
 				rid, id, time.Since(stepCommitStart).Milliseconds(), err)
 			writeDBError(w, http.StatusInternalServerError, "commit_tx", id, username, len(payload.Lines), err)
 			return
 		}
+		committed = true
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=commit duration_ms=%d total_ms=%d",
 			rid, id, time.Since(stepCommitStart).Milliseconds(), time.Since(start).Milliseconds())
 
@@ -372,6 +559,8 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
 		}
 		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s result updated=%d inserted=%d barcodeInserted=%d attributeUpserted=%d",
 			rid, id, updated, inserted, barcodeInserted, attributeAffected)
+		log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s summary tables cdItem/prItemVariant(newOnly)=%d trOrderLine(updated)=%d prItemBarcode(inserted,newOnly)=%d prItemAttribute(affected)=%d trOrderHeader(touched)=%d",
+			rid, id, inserted, updated, barcodeInserted, attributeAffected, headerTouched)
 		if err := json.NewEncoder(w).Encode(resp); err != nil {
 			log.Printf("❌ encode error: %v", err)
 		}
@@ -416,6 +605,14 @@ func buildCdItemDraftMap(list []models.OrderProductionCdItemDraft) map[string]mo
 	return out
 }
 
+func isNoCorrespondingBeginTxErr(err error) bool {
+	if err == nil {
+		return false
+	}
+	msg := strings.ToLower(strings.TrimSpace(err.Error()))
+	return strings.Contains(msg, "commit transaction request has no corresponding begin transaction")
+}
+
 func buildTargetVariants(mssql *sql.DB, orderHeaderID string, lines []models.OrderProductionUpdateLine) ([]models.OrderProductionMissingVariant, error) {
 	start := time.Now()
 	lineDimsMap, err := queries.GetOrderLineDimsMap(mssql, orderHeaderID)
@@ -468,11 +665,15 @@ func buildTargetVariants(mssql *sql.DB, orderHeaderID string, lines []models.Ord
 }
 
 func buildMissingVariants(mssql *sql.DB, orderHeaderID string, lines []models.OrderProductionUpdateLine) ([]models.OrderProductionMissingVariant, error) {
-	start := time.Now()
 	targets, err := buildTargetVariants(mssql, orderHeaderID, lines)
 	if err != nil {
 		return nil, err
 	}
+	return buildMissingVariantsFromTargets(mssql, orderHeaderID, targets)
+}
+
+func buildMissingVariantsFromTargets(mssql *sql.DB, orderHeaderID string, targets []models.OrderProductionMissingVariant) ([]models.OrderProductionMissingVariant, error) {
+	start := time.Now()
 	missing := make([]models.OrderProductionMissingVariant, 0, len(targets))
 	existsCache := make(map[string]bool, len(targets))
 
@@ -499,11 +700,69 @@ func buildMissingVariants(mssql *sql.DB, orderHeaderID string, lines []models.Or
 		}
 	}
 
-	log.Printf("[buildMissingVariants] orderHeaderID=%s lineCount=%d dimMapCount=%d missingCount=%d total_ms=%d",
-		orderHeaderID, len(lines), len(targets), len(missing), time.Since(start).Milliseconds())
+	log.Printf("[buildMissingVariants] orderHeaderID=%s targetCount=%d missingCount=%d total_ms=%d",
+		orderHeaderID, len(targets), len(missing), time.Since(start).Milliseconds())
 	return missing, nil
 }
 
+func runWithTransientMSSQLRetry(op string, maxAttempts int, baseDelay time.Duration, fn func() error) error {
+	if maxAttempts <= 1 {
+		return fn()
+	}
+	var lastErr error
+	for attempt := 1; attempt <= maxAttempts; attempt++ {
+		err := fn()
+		if err == nil {
+			return nil
+		}
+		lastErr = err
+		if !isTransientMSSQLNetworkErr(err) || attempt == maxAttempts {
+			return err
+		}
+		wait := time.Duration(attempt) * baseDelay
+		log.Printf("[MSSQLRetry] op=%s attempt=%d/%d wait_ms=%d err=%v",
+			op, attempt, maxAttempts, wait.Milliseconds(), err)
+		time.Sleep(wait)
+	}
+	return lastErr
+}
+
+func isTransientMSSQLNetworkErr(err error) bool {
+	if err == nil {
+		return false
+	}
+	msg := strings.ToLower(strings.TrimSpace(err.Error()))
+	needles := []string{
+		"wsarecv",
+		"read tcp",
+		"connection reset",
+		"connection refused",
+		"broken pipe",
+		"i/o timeout",
+		"timeout",
+	}
+	for _, needle := range needles {
+		if strings.Contains(msg, needle) {
+			return true
+		}
+	}
+	return false
+}
+
+func ensureTxAlive(tx *sql.Tx, where string) error {
+	if tx == nil {
+		return fmt.Errorf("tx is nil at %s", where)
+	}
+	var tranCount int
+	if err := tx.QueryRow(`SELECT @@TRANCOUNT`).Scan(&tranCount); err != nil {
+		return fmt.Errorf("tx state query failed at %s: %w", where, err)
+	}
+	if tranCount <= 0 {
+		return fmt.Errorf("transaction no longer active at %s (trancount=%d)", where, tranCount)
+	}
+	return nil
+}
+
 func validateUpdateLines(lines []models.OrderProductionUpdateLine) error {
 	for _, line := range lines {
 		if strings.TrimSpace(line.OrderLineID) == "" {
@@ -520,6 +779,54 @@ func validateUpdateLines(lines []models.OrderProductionUpdateLine) error {
 	return nil
 }
 
+func splitLinesByCdItemDraft(lines []models.OrderProductionUpdateLine, cdItems []models.OrderProductionCdItemDraft) ([]models.OrderProductionUpdateLine, []models.OrderProductionUpdateLine) {
+	if len(lines) == 0 {
+		return nil, nil
+	}
+	newCodeSet := make(map[string]struct{}, len(cdItems))
+	for _, item := range cdItems {
+		code := strings.ToUpper(strings.TrimSpace(item.ItemCode))
+		if code == "" {
+			continue
+		}
+		newCodeSet[code] = struct{}{}
+	}
+	if len(newCodeSet) == 0 {
+		existingLines := make([]models.OrderProductionUpdateLine, 0, len(lines))
+		existingLines = append(existingLines, lines...)
+		return nil, existingLines
+	}
+
+	newLines := make([]models.OrderProductionUpdateLine, 0, len(lines))
+	existingLines := make([]models.OrderProductionUpdateLine, 0, len(lines))
+	for _, line := range lines {
+		code := strings.ToUpper(strings.TrimSpace(line.NewItemCode))
+		if _, ok := newCodeSet[code]; ok {
+			newLines = append(newLines, line)
+			continue
+		}
+		existingLines = append(existingLines, line)
+	}
+	return newLines, existingLines
+}
+
+func uniqueCodesFromLines(lines []models.OrderProductionUpdateLine) []string {
+	set := make(map[string]struct{}, len(lines))
+	out := make([]string, 0, len(lines))
+	for _, line := range lines {
+		code := strings.ToUpper(strings.TrimSpace(line.NewItemCode))
+		if code == "" {
+			continue
+		}
+		if _, ok := set[code]; ok {
+			continue
+		}
+		set[code] = struct{}{}
+		out = append(out, code)
+	}
+	return out
+}
+
 func writeDBError(w http.ResponseWriter, status int, step string, orderHeaderID string, username string, lineCount int, err error) {
 	var sqlErr mssql.Error
 	if errors.As(err, &sqlErr) {