Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-16 12:20:02 +03:00
parent 2a8dc5d3a1
commit ab236ec256

View File

@@ -350,35 +350,36 @@ BEGIN
C.ProductDescription, C.ProductDescription,
C.ProductAtt01Desc, C.ProductAtt01Desc,
C.ProductAtt02Desc, C.ProductAtt02Desc,
'' AS ProductAtt10Desc, ISNULL(PF.ProductAtt10Desc, '') AS ProductAtt10Desc,
C.ProductAtt11Desc, C.ProductAtt11Desc,
'' AS ProductAtt21Desc, ISNULL(PF.ProductAtt21Desc, '') AS ProductAtt21Desc,
'' AS ProductAtt22Desc, ISNULL(PF.ProductAtt22Desc, '') AS ProductAtt22Desc,
'' AS ProductAtt23Desc, ISNULL(PF.ProductAtt23Desc, '') AS ProductAtt23Desc,
'' AS ProductAtt24Desc, ISNULL(PF.ProductAtt24Desc, '') AS ProductAtt24Desc,
'' AS ProductAtt25Desc, ISNULL(PF.ProductAtt25Desc, '') AS ProductAtt25Desc,
'' AS ProductAtt26Desc, ISNULL(PF.ProductAtt26Desc, '') AS ProductAtt26Desc,
'' AS ProductAtt27Desc, ISNULL(PF.ProductAtt27Desc, '') AS ProductAtt27Desc,
'' AS ProductAtt28Desc, ISNULL(PF.ProductAtt28Desc, '') AS ProductAtt28Desc,
'' AS ProductAtt29Desc, ISNULL(PF.ProductAtt29Desc, '') AS ProductAtt29Desc,
'' AS ProductAtt30Desc, ISNULL(PF.ProductAtt30Desc, '') AS ProductAtt30Desc,
'' AS ProductAtt31Desc, ISNULL(PF.ProductAtt31Desc, '') AS ProductAtt31Desc,
'' AS ProductAtt32Desc, ISNULL(PF.ProductAtt32Desc, '') AS ProductAtt32Desc,
'' AS ProductAtt33Desc, ISNULL(PF.ProductAtt33Desc, '') AS ProductAtt33Desc,
'' AS ProductAtt34Desc, ISNULL(PF.ProductAtt34Desc, '') AS ProductAtt34Desc,
'' AS ProductAtt35Desc, ISNULL(PF.ProductAtt35Desc, '') AS ProductAtt35Desc,
'' AS ProductAtt36Desc, ISNULL(PF.ProductAtt36Desc, '') AS ProductAtt36Desc,
'' AS ProductAtt37Desc, ISNULL(PF.ProductAtt37Desc, '') AS ProductAtt37Desc,
C.ProductAtt38Desc, C.ProductAtt38Desc,
'' AS ProductAtt39Desc, ISNULL(PF.ProductAtt39Desc, '') AS ProductAtt39Desc,
'' AS ProductAtt40Desc, ISNULL(PF.ProductAtt40Desc, '') AS ProductAtt40Desc,
C.ProductAtt41Desc, C.ProductAtt41Desc,
'' AS ProductAtt42Desc, ISNULL(PF.ProductAtt42Desc, '') AS ProductAtt42Desc,
'' AS ProductAtt43Desc, ISNULL(PF.ProductAtt43Desc, '') AS ProductAtt43Desc,
C.ProductAtt44Desc, C.ProductAtt44Desc,
'' AS ProductAtt45Desc, ISNULL(PF.ProductAtt45Desc, '') AS ProductAtt45Desc,
'' AS ProductAtt46Desc ISNULL(PF.ProductAtt46Desc, '') AS ProductAtt46Desc
FROM dbo.ProductFilterTRCache C FROM dbo.ProductFilterTRCache C
LEFT JOIN ProductFilterWithDescription('TR') PF ON PF.ProductCode = C.ProductCode
WHERE LEN(C.ProductCode) = 13 WHERE LEN(C.ProductCode) = 13
AND (@Kategori IS NULL OR C.ProductAtt44Desc = @Kategori) AND (@Kategori IS NULL OR C.ProductAtt44Desc = @Kategori)
AND (@UrunAnaGrubu IS NULL OR C.ProductAtt01Desc = @UrunAnaGrubu) AND (@UrunAnaGrubu IS NULL OR C.ProductAtt01Desc = @UrunAnaGrubu)