Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-04-02 10:34:50 +03:00
parent 4af852c853
commit a97accbdb1
5 changed files with 129 additions and 82 deletions

View File

@@ -968,7 +968,7 @@ VALUES (
nullableBool(header.IsSalesViaInternet, false),
nullableBool(header.IsSuspended, false),
nullableBool(header.IsCompleted, false),
nullableBool(header.IsCompleted, true),
nullableBool(header.IsPrinted, false),
nullableBool(header.IsLocked, false),

View File

@@ -3,18 +3,27 @@ package queries
const GetProductColors = `
DECLARE @ProductCode VARCHAR(30) = @p1;
WITH NormalizedColors AS (
SELECT
p.ProductCode,
CASE
WHEN ISNULL(v.ColorCode, '') = '000' THEN '001'
ELSE ISNULL(v.ColorCode, '')
END AS ColorCode
FROM ProductFilterWithDescription('TR') AS p
INNER JOIN prItemVariant AS v WITH(NOLOCK)
ON v.ItemCode = p.ProductCode
WHERE
p.ProductCode = @ProductCode
AND ISNULL(v.ColorCode, '') <> ''
)
SELECT DISTINCT
p.ProductCode,
v.ColorCode,
ISNULL(cd.ColorDescription, '') AS ColorDescription
FROM ProductFilterWithDescription('TR') AS p
INNER JOIN prItemVariant AS v WITH(NOLOCK)
ON v.ItemCode = p.ProductCode
n.ProductCode,
n.ColorCode,
ISNULL(cd.ColorDescription, CASE WHEN n.ColorCode = '001' THEN 'SIYAH' ELSE '' END) AS ColorDescription
FROM NormalizedColors AS n
LEFT JOIN cdColorDesc AS cd WITH(NOLOCK)
ON cd.ColorCode = v.ColorCode
ON cd.ColorCode = n.ColorCode
AND cd.LangCode = 'TR'
WHERE
p.ProductCode = @ProductCode
AND ISNULL(v.ColorCode, '') <> ''
ORDER BY v.ColorCode;
ORDER BY n.ColorCode;
`

View File

@@ -1,24 +1,40 @@
package queries
const GetProductSecondColors = `
WITH NormalizedVariants AS (
SELECT
Product.ProductCode,
CASE
WHEN ISNULL(prItemVariant.ColorCode, '') = '000' THEN '001'
ELSE ISNULL(prItemVariant.ColorCode, '')
END AS ColorCode,
CASE
WHEN ISNULL(prItemVariant.ItemDim2Code, '') = '000' THEN '001'
ELSE ISNULL(prItemVariant.ItemDim2Code, '')
END AS ItemDim2Code
FROM prItemVariant WITH(NOLOCK)
INNER JOIN ProductFilterWithDescription('TR') AS Product
ON prItemVariant.ItemCode = Product.ProductCode
WHERE Product.ProductCode = @ProductCode
)
SELECT
Product.ProductCode,
ISNULL(prItemVariant.ColorCode, '') AS ColorCode,
ISNULL(prItemVariant.ItemDim2Code, '') AS ItemDim2Code,
ISNULL(ColorDesc.ColorDescription, '') AS ColorDescription
FROM prItemVariant WITH(NOLOCK)
INNER JOIN ProductFilterWithDescription('TR') AS Product
ON prItemVariant.ItemCode = Product.ProductCode
Variant.ProductCode,
Variant.ColorCode,
Variant.ItemDim2Code,
ISNULL(ColorDesc.ColorDescription, CASE WHEN Variant.ItemDim2Code = '001' THEN 'SIYAH' ELSE '' END) AS ColorDescription
FROM NormalizedVariants AS Variant
LEFT JOIN cdColorDesc AS ColorDesc WITH(NOLOCK)
ON ColorDesc.ColorCode = prItemVariant.ItemDim2Code
ON ColorDesc.ColorCode = Variant.ItemDim2Code
AND ColorDesc.LangCode = 'TR'
WHERE Product.ProductCode = @ProductCode
AND prItemVariant.ColorCode = @ColorCode
AND ISNULL(prItemVariant.ItemDim2Code, '') <> ''
WHERE Variant.ColorCode = CASE
WHEN ISNULL(@ColorCode, '') = '000' THEN '001'
ELSE ISNULL(@ColorCode, '')
END
AND Variant.ItemDim2Code <> ''
GROUP BY
Product.ProductCode,
prItemVariant.ItemDim2Code,
prItemVariant.ColorCode,
Variant.ProductCode,
Variant.ItemDim2Code,
Variant.ColorCode,
ColorDesc.ColorDescription
ORDER BY ItemDim2Code
ORDER BY Variant.ItemDim2Code
`