Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-04-14 17:03:21 +03:00
parent d8b6b7166c
commit e352b8c47a

View File

@@ -280,7 +280,7 @@ func InsertMissingVariantsTx(
query := fmt.Sprintf(`
SET NOCOUNT ON;
WITH Missing(ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code) AS (
;WITH Missing(ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code) AS (
SELECT *
FROM (VALUES %s) AS v(ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code)
)
@@ -560,7 +560,7 @@ func UpdateOrderLinesTx(tx *sql.Tx, orderHeaderID string, lines []models.OrderPr
query := fmt.Sprintf(`
SET NOCOUNT ON;
WITH src (OrderLineID, NewItemCode, NewColor, ItemDim1Code, NewDim2, NewDesc, OldDueDate, NewDueDate) AS (
;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)
)
@@ -834,7 +834,7 @@ func UpsertItemBarcodesTx(tx *sql.Tx, orderHeaderID string, lines []models.Order
query := fmt.Sprintf(`
SET NOCOUNT ON;
WITH srcLine (OrderLineID) AS (
;WITH srcLine (OrderLineID) AS (
SELECT *
FROM (VALUES %s) AS v (OrderLineID)
),
@@ -965,7 +965,7 @@ SET NOCOUNT ON;
DECLARE @updated INT = 0;
DECLARE @inserted INT = 0;
WITH src (ItemTypeCode, ItemCode, AttributeTypeCode, AttributeCode) AS (
;WITH src (ItemTypeCode, ItemCode, AttributeTypeCode, AttributeCode) AS (
SELECT *
FROM (VALUES %s) AS v (ItemTypeCode, ItemCode, AttributeTypeCode, AttributeCode)
)
@@ -981,7 +981,7 @@ JOIN src
AND src.AttributeTypeCode = tgt.AttributeTypeCode;
SET @updated = @@ROWCOUNT;
WITH src (ItemTypeCode, ItemCode, AttributeTypeCode, AttributeCode) AS (
;WITH src (ItemTypeCode, ItemCode, AttributeTypeCode, AttributeCode) AS (
SELECT *
FROM (VALUES %s) AS v (ItemTypeCode, ItemCode, AttributeTypeCode, AttributeCode)
)