From 10fd77bece8c08f2b88c12972073897b58355fbb Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Wed, 24 Jun 2026 19:47:09 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- svc/queries/brand_sync.go | 4 +- svc/queries/customer_balance_list.go | 12 +- svc/queries/customerlist.go | 10 +- svc/queries/orderinventory.go | 2 +- svc/queries/orderproduction_items.go | 42 ++--- svc/queries/piyasa_scope.go | 2 +- svc/queries/product_pricing.go | 146 +++++++++--------- svc/queries/product_pricing_dims_mssql.go | 2 +- svc/queries/productattributes.go | 10 +- svc/queries/productcolor.go | 4 +- svc/queries/productcolorsize.go | 6 +- svc/queries/productnewcolor.go | 4 +- svc/queries/productnewsecondcolor.go | 4 +- svc/queries/productsecondcolor.go | 4 +- svc/queries/productstockquery.go | 14 +- .../wholesale_campaign_variants_mssql.go | 6 +- svc/routes/product_cditem.go | 2 +- svc/routes/product_pricing_history.go | 2 +- svc/routes/product_pricing_save.go | 6 +- 19 files changed, 141 insertions(+), 141 deletions(-) diff --git a/svc/queries/brand_sync.go b/svc/queries/brand_sync.go index f1876dd..584be51 100644 --- a/svc/queries/brand_sync.go +++ b/svc/queries/brand_sync.go @@ -32,8 +32,8 @@ SELECT DISTINCT LTRIM(RTRIM(a.AttributeCode)) AS BrandCode, COALESCE(NULLIF(LTRIM(RTRIM(d.AttributeDescription)), ''), LTRIM(RTRIM(a.AttributeCode))) AS BrandName, ISNULL(a.IsBlocked, 0) AS IsBlocked -FROM dbo.cdItemAttribute a WITH(NOLOCK) -LEFT JOIN dbo.cdItemAttributeDesc d WITH(NOLOCK) +FROM dbo.cdItemAttribute a +LEFT JOIN dbo.cdItemAttributeDesc d ON d.ItemTypeCode = a.ItemTypeCode AND d.AttributeTypeCode = a.AttributeTypeCode AND d.AttributeCode = a.AttributeCode diff --git a/svc/queries/customer_balance_list.go b/svc/queries/customer_balance_list.go index 9e171b3..fc6fdf1 100644 --- a/svc/queries/customer_balance_list.go +++ b/svc/queries/customer_balance_list.go @@ -441,18 +441,18 @@ func loadCariMetaMap(ctx context.Context, lines []mkCariBakiyeLine) (map[string] ILCE = ISNULL(CASE WHEN c.CurrAccTypeCode=1 THEN vad.VendorAtt07Desc ELSE cad.CustomerAtt07Desc END, ''), TC = ISNULL(c.IdentityNum, ''), Risk_Durumu = ISNULL(CASE WHEN c.CurrAccTypeCode=1 THEN vad.VendorAtt03Desc ELSE cad.CustomerAtt03Desc END, '') - FROM cdCurrAcc c WITH(NOLOCK) - LEFT JOIN cdCurrAccDesc d WITH(NOLOCK) + FROM cdCurrAcc c + LEFT JOIN cdCurrAccDesc d ON d.CurrAccTypeCode = c.CurrAccTypeCode AND d.CurrAccCode = c.CurrAccCode AND d.LangCode = 'TR' - LEFT JOIN VendorAttributes va WITH(NOLOCK) + LEFT JOIN VendorAttributes va ON va.CurrAccTypeCode = c.CurrAccTypeCode AND va.CurrAccCode = c.CurrAccCode LEFT JOIN VendorAttributeDescriptions('TR') vad ON vad.CurrAccTypeCode = c.CurrAccTypeCode AND vad.CurrAccCode = c.CurrAccCode - LEFT JOIN CustomerAttributes ca WITH(NOLOCK) + LEFT JOIN CustomerAttributes ca ON ca.CurrAccTypeCode = c.CurrAccTypeCode AND ca.CurrAccCode = c.CurrAccCode LEFT JOIN CustomerAttributeDescriptions('TR') cad @@ -530,7 +530,7 @@ func loadGLAccountMap(ctx context.Context, lines []mkCariBakiyeLine) (map[string query := fmt.Sprintf(` SELECT CurrAccTypeCode, CurrAccCode, CompanyCode, GLAccCode - FROM prCurrAccGLAccount WITH(NOLOCK) + FROM prCurrAccGLAccount WHERE PostAccTypeCode = 100 AND CompanyCode IN (%s) AND (%s) @@ -561,7 +561,7 @@ func loadGLAccountMap(ctx context.Context, lines []mkCariBakiyeLine) (map[string } func loadCompanyMap(ctx context.Context) (map[int]string, error) { - rows, err := db.MssqlDB.QueryContext(ctx, `SELECT CompanyCode, CompanyName FROM cdCompany WITH(NOLOCK)`) + rows, err := db.MssqlDB.QueryContext(ctx, `SELECT CompanyCode, CompanyName FROM cdCompany`) if err != nil { return nil, fmt.Errorf("company map query error: %w", err) } diff --git a/svc/queries/customerlist.go b/svc/queries/customerlist.go index e8044e0..f35a39a 100644 --- a/svc/queries/customerlist.go +++ b/svc/queries/customerlist.go @@ -25,7 +25,7 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) { dbo.HG_Temizlik( ISNULL(( SELECT AttributeDescription - FROM cdCurrAccAttributeDesc WITH(NOLOCK) + FROM cdCurrAccAttributeDesc WHERE CurrAccTypeCode = 3 AND AttributeTypeCode = 8 AND AttributeCode = f.CustomerAtt08 @@ -36,7 +36,7 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) { dbo.HG_Temizlik( ISNULL(( SELECT AttributeDescription - FROM cdCurrAccAttributeDesc WITH(NOLOCK) + FROM cdCurrAccAttributeDesc WHERE CurrAccTypeCode = 3 AND AttributeTypeCode = 1 AND AttributeCode = f.CustomerAtt01 @@ -47,7 +47,7 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) { dbo.HG_Temizlik( ISNULL(( SELECT AttributeDescription - FROM cdCurrAccAttributeDesc WITH(NOLOCK) + FROM cdCurrAccAttributeDesc WHERE CurrAccTypeCode = 3 AND AttributeTypeCode = 2 AND AttributeCode = f.CustomerAtt02 @@ -58,7 +58,7 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) { dbo.HG_Temizlik( ISNULL(( SELECT AttributeDescription - FROM cdCurrAccAttributeDesc WITH(NOLOCK) + FROM cdCurrAccAttributeDesc WHERE CurrAccTypeCode = 3 AND AttributeTypeCode = 5 AND AttributeCode = f.CustomerAtt05 @@ -69,7 +69,7 @@ func GetCustomerList(ctx context.Context) ([]models.CustomerList, error) { ISNULL(c.CurrencyCode, ''), ISNULL(( SELECT TOP 1 CAST(pa.PostalAddressID AS varchar(36)) - FROM prCurrAccPostalAddress pa WITH(NOLOCK) + FROM prCurrAccPostalAddress pa WHERE pa.CurrAccTypeCode = c.CurrAccTypeCode AND pa.CurrAccCode = c.CurrAccCode AND pa.AddressTypeCode = 2 diff --git a/svc/queries/orderinventory.go b/svc/queries/orderinventory.go index a6dceb1..e6221f3 100644 --- a/svc/queries/orderinventory.go +++ b/svc/queries/orderinventory.go @@ -29,7 +29,7 @@ SELECT Inventory.ColorCode AS Renk_Kodu, ISNULL(( SELECT TOP 1 ColorDescription - FROM cdColorDesc WITH(NOLOCK) + FROM cdColorDesc WHERE cdColorDesc.ColorCode = Inventory.ColorCode AND cdColorDesc.LangCode = N'TR' ), '') AS Renk_Aciklamasi, diff --git a/svc/queries/orderproduction_items.go b/svc/queries/orderproduction_items.go index 7e94c15..d6034a9 100644 --- a/svc/queries/orderproduction_items.go +++ b/svc/queries/orderproduction_items.go @@ -206,7 +206,7 @@ SELECT ISNULL(ItemDim1Code,'') AS ItemDim1Code, ISNULL(ItemDim2Code,'') AS ItemDim2Code, ISNULL(ItemDim3Code,'') AS ItemDim3Code -FROM dbo.trOrderLine WITH(NOLOCK) +FROM dbo.trOrderLine WHERE OrderHeaderID = @p1 `, orderHeaderID) if err != nil { @@ -519,7 +519,7 @@ SET WHEN NULLIF(@p8,'') IS NULL THEN ItemTaxGrCode WHEN EXISTS ( SELECT 1 - FROM dbo.cdItemTaxGr g WITH(NOLOCK) + FROM dbo.cdItemTaxGr g WHERE LTRIM(RTRIM(g.ItemTaxGrCode)) = LTRIM(RTRIM(@p8)) ) THEN @p8 ELSE ItemTaxGrCode @@ -1670,13 +1670,13 @@ func GetOrderProductionLookupOptions(mssql *sql.DB) (models.OrderProductionCdIte {"ItemDimTypeCodes", `SELECT CAST(t.ItemDimTypeCode AS NVARCHAR(50)) AS Code, ISNULL(d.ItemDimTypeDescription, CAST(t.ItemDimTypeCode AS NVARCHAR(50))) AS [Description] - FROM dbo.bsItemDimType t WITH(NOLOCK) - LEFT JOIN dbo.bsItemDimTypeDesc d WITH(NOLOCK) + FROM dbo.bsItemDimType t + LEFT JOIN dbo.bsItemDimTypeDesc d ON d.ItemDimTypeCode = t.ItemDimTypeCode AND d.LangCode = 'TR' WHERE ISNULL(t.IsBlocked, 0) = 0 ORDER BY t.ItemDimTypeCode`, &out.ItemDimTypeCodes}, - {"ProductTypeCodes", `SELECT DISTINCT CAST(ProductTypeCode AS NVARCHAR(50)) AS Code, CAST(ProductTypeCode AS NVARCHAR(50)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE ProductTypeCode IS NOT NULL ORDER BY Code`, &out.ProductTypeCodes}, + {"ProductTypeCodes", `SELECT DISTINCT CAST(ProductTypeCode AS NVARCHAR(50)) AS Code, CAST(ProductTypeCode AS NVARCHAR(50)) AS [Description] FROM dbo.cdItem WHERE ProductTypeCode IS NOT NULL ORDER BY Code`, &out.ProductTypeCodes}, {"ProductHierarchyIDs", `SELECT CAST(h.ProductHierarchyID AS NVARCHAR(50)) AS Code, LTRIM(RTRIM( @@ -1688,25 +1688,25 @@ func GetOrderProductionLookupOptions(mssql *sql.DB) (models.OrderProductionCdIte END ) )) AS [Description] - FROM dbo.dfProductHierarchy h WITH(NOLOCK) - LEFT JOIN dbo.cdProductHierarchyLevelDesc d WITH(NOLOCK) + FROM dbo.dfProductHierarchy h + LEFT JOIN dbo.cdProductHierarchyLevelDesc d ON d.ProductHierarchyLevelCode = h.ProductHierarchyLevelCode01 AND d.LangCode = 'TR' ORDER BY h.ProductHierarchyID`, &out.ProductHierarchyIDs}, - {"UnitOfMeasureCode1List", `SELECT DISTINCT CAST(UnitOfMeasureCode1 AS NVARCHAR(50)) AS Code, CAST(UnitOfMeasureCode1 AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(UnitOfMeasureCode1 AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.UnitOfMeasureCode1List}, - {"ItemAccountGrCodes", `SELECT DISTINCT CAST(ItemAccountGrCode AS NVARCHAR(50)) AS Code, CAST(ItemAccountGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(ItemAccountGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemAccountGrCodes}, - {"ItemTaxGrCodes", `SELECT DISTINCT CAST(ItemTaxGrCode AS NVARCHAR(50)) AS Code, CAST(ItemTaxGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(ItemTaxGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemTaxGrCodes}, - {"ItemPaymentPlanGrCodes", `SELECT DISTINCT CAST(ItemPaymentPlanGrCode AS NVARCHAR(50)) AS Code, CAST(ItemPaymentPlanGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(ItemPaymentPlanGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemPaymentPlanGrCodes}, - {"ItemDiscountGrCodes", `SELECT DISTINCT CAST(ItemDiscountGrCode AS NVARCHAR(50)) AS Code, CAST(ItemDiscountGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(ItemDiscountGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemDiscountGrCodes}, - {"ItemVendorGrCodes", `SELECT DISTINCT CAST(ItemVendorGrCode AS NVARCHAR(50)) AS Code, CAST(ItemVendorGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(ItemVendorGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemVendorGrCodes}, - {"PromotionGroupCodes", `SELECT DISTINCT CAST(PromotionGroupCode AS NVARCHAR(50)) AS Code, CAST(PromotionGroupCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(PromotionGroupCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.PromotionGroupCodes}, - {"ProductCollectionGrCodes", `SELECT DISTINCT CAST(ProductCollectionGrCode AS NVARCHAR(50)) AS Code, CAST(ProductCollectionGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(ProductCollectionGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ProductCollectionGrCodes}, - {"StorePriceLevelCodes", `SELECT DISTINCT CAST(StorePriceLevelCode AS NVARCHAR(50)) AS Code, CAST(StorePriceLevelCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(StorePriceLevelCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.StorePriceLevelCodes}, - {"PerceptionOfFashionCodes", `SELECT DISTINCT CAST(PerceptionOfFashionCode AS NVARCHAR(50)) AS Code, CAST(PerceptionOfFashionCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(PerceptionOfFashionCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.PerceptionOfFashionCodes}, - {"CommercialRoleCodes", `SELECT DISTINCT CAST(CommercialRoleCode AS NVARCHAR(50)) AS Code, CAST(CommercialRoleCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(CommercialRoleCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.CommercialRoleCodes}, - {"StoreCapacityLevelCodes", `SELECT DISTINCT CAST(StoreCapacityLevelCode AS NVARCHAR(50)) AS Code, CAST(StoreCapacityLevelCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(StoreCapacityLevelCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.StoreCapacityLevelCodes}, - {"CustomsTariffNumbers", `SELECT DISTINCT CAST(CustomsTariffNumberCode AS NVARCHAR(50)) AS Code, CAST(CustomsTariffNumberCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(CustomsTariffNumberCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.CustomsTariffNumbers}, - {"CompanyCodes", `SELECT DISTINCT CAST(CompanyCode AS NVARCHAR(50)) AS Code, CAST(CompanyCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WITH(NOLOCK) WHERE NULLIF(LTRIM(RTRIM(CAST(CompanyCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.CompanyCodes}, + {"UnitOfMeasureCode1List", `SELECT DISTINCT CAST(UnitOfMeasureCode1 AS NVARCHAR(50)) AS Code, CAST(UnitOfMeasureCode1 AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(UnitOfMeasureCode1 AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.UnitOfMeasureCode1List}, + {"ItemAccountGrCodes", `SELECT DISTINCT CAST(ItemAccountGrCode AS NVARCHAR(50)) AS Code, CAST(ItemAccountGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(ItemAccountGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemAccountGrCodes}, + {"ItemTaxGrCodes", `SELECT DISTINCT CAST(ItemTaxGrCode AS NVARCHAR(50)) AS Code, CAST(ItemTaxGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(ItemTaxGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemTaxGrCodes}, + {"ItemPaymentPlanGrCodes", `SELECT DISTINCT CAST(ItemPaymentPlanGrCode AS NVARCHAR(50)) AS Code, CAST(ItemPaymentPlanGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(ItemPaymentPlanGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemPaymentPlanGrCodes}, + {"ItemDiscountGrCodes", `SELECT DISTINCT CAST(ItemDiscountGrCode AS NVARCHAR(50)) AS Code, CAST(ItemDiscountGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(ItemDiscountGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemDiscountGrCodes}, + {"ItemVendorGrCodes", `SELECT DISTINCT CAST(ItemVendorGrCode AS NVARCHAR(50)) AS Code, CAST(ItemVendorGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(ItemVendorGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ItemVendorGrCodes}, + {"PromotionGroupCodes", `SELECT DISTINCT CAST(PromotionGroupCode AS NVARCHAR(50)) AS Code, CAST(PromotionGroupCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(PromotionGroupCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.PromotionGroupCodes}, + {"ProductCollectionGrCodes", `SELECT DISTINCT CAST(ProductCollectionGrCode AS NVARCHAR(50)) AS Code, CAST(ProductCollectionGrCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(ProductCollectionGrCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.ProductCollectionGrCodes}, + {"StorePriceLevelCodes", `SELECT DISTINCT CAST(StorePriceLevelCode AS NVARCHAR(50)) AS Code, CAST(StorePriceLevelCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(StorePriceLevelCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.StorePriceLevelCodes}, + {"PerceptionOfFashionCodes", `SELECT DISTINCT CAST(PerceptionOfFashionCode AS NVARCHAR(50)) AS Code, CAST(PerceptionOfFashionCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(PerceptionOfFashionCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.PerceptionOfFashionCodes}, + {"CommercialRoleCodes", `SELECT DISTINCT CAST(CommercialRoleCode AS NVARCHAR(50)) AS Code, CAST(CommercialRoleCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(CommercialRoleCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.CommercialRoleCodes}, + {"StoreCapacityLevelCodes", `SELECT DISTINCT CAST(StoreCapacityLevelCode AS NVARCHAR(50)) AS Code, CAST(StoreCapacityLevelCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(StoreCapacityLevelCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.StoreCapacityLevelCodes}, + {"CustomsTariffNumbers", `SELECT DISTINCT CAST(CustomsTariffNumberCode AS NVARCHAR(50)) AS Code, CAST(CustomsTariffNumberCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(CustomsTariffNumberCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.CustomsTariffNumbers}, + {"CompanyCodes", `SELECT DISTINCT CAST(CompanyCode AS NVARCHAR(50)) AS Code, CAST(CompanyCode AS NVARCHAR(200)) AS [Description] FROM dbo.cdItem WHERE NULLIF(LTRIM(RTRIM(CAST(CompanyCode AS NVARCHAR(200)))), '') IS NOT NULL ORDER BY Code`, &out.CompanyCodes}, } for _, pair := range queryPairs { diff --git a/svc/queries/piyasa_scope.go b/svc/queries/piyasa_scope.go index 4095505..12ade1e 100644 --- a/svc/queries/piyasa_scope.go +++ b/svc/queries/piyasa_scope.go @@ -34,7 +34,7 @@ func buildPiyasaExistsForCariCode(ctx context.Context, cariCodeExpr string) (str return fmt.Sprintf(` EXISTS ( SELECT 1 - FROM CustomerAttributesFilter PF WITH(NOLOCK) + FROM CustomerAttributesFilter PF WHERE (PF.CurrAccCode = %s OR LEFT(PF.CurrAccCode, 8) = LEFT(%s, 8)) AND %s )`, cariCodeExpr, cariCodeExpr, inClause), nil diff --git a/svc/queries/product_pricing.go b/svc/queries/product_pricing.go index de6a756..91e890b 100644 --- a/svc/queries/product_pricing.go +++ b/svc/queries/product_pricing.go @@ -162,50 +162,50 @@ func GetAllProductPricingRows(ctx context.Context, chunkSize int, filters Produc CREATE CLUSTERED INDEX IX_req_codes_ProductCode ON #req_codes(ProductCode); SELECT - LTRIM(RTRIM(s.ItemCode)) AS ItemCode, + s.ItemCode AS ItemCode, SUM(s.In_Qty1 - s.Out_Qty1) AS InventoryQty1 INTO #stock_base - FROM trStock s WITH(NOLOCK) + FROM trStock s INNER JOIN #req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(s.ItemCode)) + ON rc.ProductCode = s.ItemCode WHERE s.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(s.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(s.ItemCode)); + AND LEN(s.ItemCode) = 13 + GROUP BY s.ItemCode; CREATE CLUSTERED INDEX IX_stock_base_ItemCode ON #stock_base(ItemCode); SELECT - LTRIM(RTRIM(p.ItemCode)) AS ItemCode, + p.ItemCode AS ItemCode, SUM(p.Qty1) AS PickingQty1 INTO #pick_base FROM PickingStates p INNER JOIN #req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(p.ItemCode)) + ON rc.ProductCode = p.ItemCode WHERE p.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(p.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(p.ItemCode)); + AND LEN(p.ItemCode) = 13 + GROUP BY p.ItemCode; SELECT - LTRIM(RTRIM(r.ItemCode)) AS ItemCode, + r.ItemCode AS ItemCode, SUM(r.Qty1) AS ReserveQty1 INTO #reserve_base FROM ReserveStates r INNER JOIN #req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(r.ItemCode)) + ON rc.ProductCode = r.ItemCode WHERE r.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(r.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(r.ItemCode)); + AND LEN(r.ItemCode) = 13 + GROUP BY r.ItemCode; SELECT - LTRIM(RTRIM(d.ItemCode)) AS ItemCode, + d.ItemCode AS ItemCode, SUM(d.Qty1) AS DispOrderQty1 INTO #disp_base FROM DispOrderStates d INNER JOIN #req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(d.ItemCode)) + ON rc.ProductCode = d.ItemCode WHERE d.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(d.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(d.ItemCode)); + AND LEN(d.ItemCode) = 13 + GROUP BY d.ItemCode; SELECT rc.ProductCode, @@ -315,16 +315,16 @@ func enrichAllProductPricingRows(ctx context.Context, out []models.ProductPricin ), latest_pricelist_line AS ( SELECT - LTRIM(RTRIM(p.ItemCode)) AS ItemCode, + p.ItemCode AS ItemCode, LTRIM(RTRIM(p.DocCurrencyCode)) AS DocCurrencyCode, CAST(p.Price AS DECIMAL(18, 2)) AS Price, ROW_NUMBER() OVER ( - PARTITION BY LTRIM(RTRIM(p.ItemCode)), LTRIM(RTRIM(p.DocCurrencyCode)) + PARTITION BY p.ItemCode, LTRIM(RTRIM(p.DocCurrencyCode)) ORDER BY p.ValidDate DESC, p.ValidTime DESC, p.LastUpdatedDate DESC ) AS rn - FROM dbo.trPriceListLine p WITH(NOLOCK) + FROM dbo.trPriceListLine p INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(p.ItemCode)) + ON rc.ProductCode = p.ItemCode WHERE p.ItemTypeCode = 1 AND ISNULL(p.IsDisabled, 0) = 0 AND LTRIM(RTRIM(p.DocCurrencyCode)) IN ('USD', 'TRY') @@ -346,29 +346,29 @@ func enrichAllProductPricingRows(ctx context.Context, out []models.ProductPricin ), latest_base_price AS ( SELECT - LTRIM(RTRIM(b.ItemCode)) AS ItemCode, + b.ItemCode AS ItemCode, CAST(b.Price AS DECIMAL(18, 2)) AS CostPrice, CONVERT(VARCHAR(10), b.PriceDate, 23) AS LastPricingDate, ROW_NUMBER() OVER ( - PARTITION BY LTRIM(RTRIM(b.ItemCode)) + PARTITION BY b.ItemCode ORDER BY b.PriceDate DESC, b.LastUpdatedDate DESC ) AS rn FROM prItemBasePrice b INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(b.ItemCode)) + ON rc.ProductCode = b.ItemCode WHERE b.ItemTypeCode = 1 AND b.BasePriceCode = 1 AND LTRIM(RTRIM(b.CurrencyCode)) = 'USD' ), stock_entry_dates AS ( SELECT - LTRIM(RTRIM(s.ItemCode)) AS ItemCode, + s.ItemCode AS ItemCode, CONVERT(VARCHAR(10), MAX(s.OperationDate), 23) AS StockEntryDate - FROM trStock s WITH(NOLOCK) + FROM trStock s INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(s.ItemCode)) + ON rc.ProductCode = s.ItemCode WHERE s.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(s.ItemCode))) = 13 + AND LEN(s.ItemCode) = 13 AND s.In_Qty1 > 0 AND LTRIM(RTRIM(s.InnerProcessCode)) = 'OP' AND LTRIM(RTRIM(s.WarehouseCode)) IN ( @@ -376,7 +376,7 @@ func enrichAllProductPricingRows(ctx context.Context, out []models.ProductPricin '1-0-24','1-2-6','1-1-14','1-0-2','1-0-52','1-1-2','1-0-21','1-1-3', '1-0-33','101','1-014','1-0-49','1-0-36' ) - GROUP BY LTRIM(RTRIM(s.ItemCode)) + GROUP BY s.ItemCode ) SELECT rc.ProductCode, @@ -431,7 +431,7 @@ func enrichAllProductPricingRows(ctx context.Context, out []models.ProductPricin SELECT LTRIM(RTRIM(m.UrunKodu)) AS UrunKodu, CONVERT(VARCHAR(10), MAX(m.Tarihi), 23) AS LastCostingDate - FROM dbo.spUrtOnMLMas m WITH(NOLOCK) + FROM dbo.spUrtOnMLMas m INNER JOIN req_codes rc ON rc.ProductCode = LTRIM(RTRIM(m.UrunKodu)) GROUP BY LTRIM(RTRIM(m.UrunKodu)); @@ -878,15 +878,15 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro CREATE CLUSTERED INDEX IX_req_codes_ProductCode ON #req_codes(ProductCode); SELECT - LTRIM(RTRIM(s.ItemCode)) AS ItemCode, + s.ItemCode AS ItemCode, SUM(s.In_Qty1 - s.Out_Qty1) AS InventoryQty1 INTO #stock_base - FROM trStock s WITH(NOLOCK) + FROM trStock s INNER JOIN #req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(s.ItemCode)) + ON rc.ProductCode = s.ItemCode WHERE s.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(s.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(s.ItemCode)); + AND LEN(s.ItemCode) = 13 + GROUP BY s.ItemCode; CREATE CLUSTERED INDEX IX_stock_base_ItemCode ON #stock_base(ItemCode); @@ -927,7 +927,7 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro ), attr AS ( SELECT - LTRIM(RTRIM(a.ItemCode)) AS ProductCode, + a.ItemCode AS ProductCode, MAX(CASE WHEN a.AttributeTypeCode = 45 THEN COALESCE(NULLIF(LTRIM(RTRIM(d.AttributeDescription)), ''), LTRIM(RTRIM(a.AttributeCode))) ELSE '' END) AS AskiliYan, MAX(CASE WHEN a.AttributeTypeCode = 44 THEN COALESCE(NULLIF(LTRIM(RTRIM(d.AttributeDescription)), ''), LTRIM(RTRIM(a.AttributeCode))) ELSE '' END) AS Kategori, MAX(CASE WHEN a.AttributeTypeCode = 42 THEN LTRIM(RTRIM(a.AttributeCode)) ELSE '' END) AS UrunIlkGrubuCode, @@ -938,17 +938,17 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro MAX(CASE WHEN a.AttributeTypeCode = 29 THEN COALESCE(NULLIF(LTRIM(RTRIM(d.AttributeDescription)), ''), LTRIM(RTRIM(a.AttributeCode))) ELSE '' END) AS Karisim, MAX(CASE WHEN a.AttributeTypeCode = 10 THEN COALESCE(NULLIF(LTRIM(RTRIM(d.AttributeDescription)), ''), LTRIM(RTRIM(a.AttributeCode))) ELSE '' END) AS Marka, MAX(CASE WHEN a.AttributeTypeCode = 10 THEN LTRIM(RTRIM(a.AttributeCode)) ELSE '' END) AS BrandCode - FROM dbo.prItemAttribute a WITH(NOLOCK) + FROM dbo.prItemAttribute a INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(a.ItemCode)) - LEFT JOIN dbo.cdItemAttributeDesc d WITH(NOLOCK) + ON rc.ProductCode = a.ItemCode + LEFT JOIN dbo.cdItemAttributeDesc d ON d.ItemTypeCode = a.ItemTypeCode AND d.AttributeTypeCode = a.AttributeTypeCode AND d.AttributeCode = a.AttributeCode AND d.LangCode = 'TR' WHERE a.ItemTypeCode = 1 AND a.AttributeTypeCode IN (1,2,10,29,41,42,44,45) - GROUP BY LTRIM(RTRIM(a.ItemCode)) + GROUP BY a.ItemCode ) SELECT rc.ProductCode, @@ -963,13 +963,13 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro COALESCE(attr.Marka, '') AS Marka, COALESCE(attr.BrandCode, '') AS BrandCode FROM req_codes rc - INNER JOIN dbo.cdItem ci WITH(NOLOCK) + INNER JOIN dbo.cdItem ci ON ci.ItemTypeCode = 1 - AND LTRIM(RTRIM(ci.ItemCode)) = rc.ProductCode + AND ci.ItemCode = rc.ProductCode LEFT JOIN attr ON attr.ProductCode = rc.ProductCode WHERE ISNULL(ci.IsBlocked, 0) = 0 - AND LEN(LTRIM(RTRIM(ci.ItemCode))) = 13 + AND LEN(ci.ItemCode) = 13 AND COALESCE(attr.UrunIlkGrubuCode, '') IN ('SERI', 'AKSESUAR') ORDER BY rc.ProductCode ASC OFFSET ` + strconv.Itoa(offset) + ` ROWS @@ -1109,16 +1109,16 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro -- Base prices from Nebim V3 price lists (trPriceListLine). -- Pick the latest record per (ItemCode, Currency) using ValidDate/ValidTime, then LastUpdatedDate. SELECT - LTRIM(RTRIM(p.ItemCode)) AS ItemCode, + p.ItemCode AS ItemCode, LTRIM(RTRIM(p.DocCurrencyCode)) AS DocCurrencyCode, CAST(p.Price AS DECIMAL(18, 2)) AS Price, ROW_NUMBER() OVER ( - PARTITION BY LTRIM(RTRIM(p.ItemCode)), LTRIM(RTRIM(p.DocCurrencyCode)) + PARTITION BY p.ItemCode, LTRIM(RTRIM(p.DocCurrencyCode)) ORDER BY p.ValidDate DESC, p.ValidTime DESC, p.LastUpdatedDate DESC ) AS rn - FROM dbo.trPriceListLine p WITH(NOLOCK) + FROM dbo.trPriceListLine p INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(p.ItemCode)) + ON rc.ProductCode = p.ItemCode WHERE p.ItemTypeCode = 1 AND ISNULL(p.IsDisabled, 0) = 0 AND LTRIM(RTRIM(p.DocCurrencyCode)) IN ('USD', 'TRY') @@ -1140,29 +1140,29 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro ), latest_base_price AS ( SELECT - LTRIM(RTRIM(b.ItemCode)) AS ItemCode, + b.ItemCode AS ItemCode, CAST(b.Price AS DECIMAL(18, 2)) AS CostPrice, CONVERT(VARCHAR(10), b.PriceDate, 23) AS LastPricingDate, ROW_NUMBER() OVER ( - PARTITION BY LTRIM(RTRIM(b.ItemCode)) + PARTITION BY b.ItemCode ORDER BY b.PriceDate DESC, b.LastUpdatedDate DESC ) AS rn FROM prItemBasePrice b INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(b.ItemCode)) + ON rc.ProductCode = b.ItemCode WHERE b.ItemTypeCode = 1 AND b.BasePriceCode = 1 AND LTRIM(RTRIM(b.CurrencyCode)) = 'USD' ), stock_entry_dates AS ( SELECT - LTRIM(RTRIM(s.ItemCode)) AS ItemCode, + s.ItemCode AS ItemCode, CONVERT(VARCHAR(10), MAX(s.OperationDate), 23) AS StockEntryDate - FROM trStock s WITH(NOLOCK) + FROM trStock s INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(s.ItemCode)) + ON rc.ProductCode = s.ItemCode WHERE s.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(s.ItemCode))) = 13 + AND LEN(s.ItemCode) = 13 AND s.In_Qty1 > 0 AND LTRIM(RTRIM(s.InnerProcessCode)) = 'OP' AND LTRIM(RTRIM(s.WarehouseCode)) IN ( @@ -1170,51 +1170,51 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro '1-0-24','1-2-6','1-1-14','1-0-2','1-0-52','1-1-2','1-0-21','1-1-3', '1-0-33','101','1-014','1-0-49','1-0-36' ) - GROUP BY LTRIM(RTRIM(s.ItemCode)) + GROUP BY s.ItemCode ), stock_base AS ( SELECT - LTRIM(RTRIM(s.ItemCode)) AS ItemCode, + s.ItemCode AS ItemCode, SUM(s.In_Qty1 - s.Out_Qty1) AS InventoryQty1 - FROM trStock s WITH(NOLOCK) + FROM trStock s INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(s.ItemCode)) + ON rc.ProductCode = s.ItemCode WHERE s.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(s.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(s.ItemCode)) + AND LEN(s.ItemCode) = 13 + GROUP BY s.ItemCode ), pick_base AS ( SELECT - LTRIM(RTRIM(p.ItemCode)) AS ItemCode, + p.ItemCode AS ItemCode, SUM(p.Qty1) AS PickingQty1 FROM PickingStates p INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(p.ItemCode)) + ON rc.ProductCode = p.ItemCode WHERE p.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(p.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(p.ItemCode)) + AND LEN(p.ItemCode) = 13 + GROUP BY p.ItemCode ), reserve_base AS ( SELECT - LTRIM(RTRIM(r.ItemCode)) AS ItemCode, + r.ItemCode AS ItemCode, SUM(r.Qty1) AS ReserveQty1 FROM ReserveStates r INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(r.ItemCode)) + ON rc.ProductCode = r.ItemCode WHERE r.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(r.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(r.ItemCode)) + AND LEN(r.ItemCode) = 13 + GROUP BY r.ItemCode ), disp_base AS ( SELECT - LTRIM(RTRIM(d.ItemCode)) AS ItemCode, + d.ItemCode AS ItemCode, SUM(d.Qty1) AS DispOrderQty1 FROM DispOrderStates d INNER JOIN req_codes rc - ON rc.ProductCode = LTRIM(RTRIM(d.ItemCode)) + ON rc.ProductCode = d.ItemCode WHERE d.ItemTypeCode = 1 - AND LEN(LTRIM(RTRIM(d.ItemCode))) = 13 - GROUP BY LTRIM(RTRIM(d.ItemCode)) + AND LEN(d.ItemCode) = 13 + GROUP BY d.ItemCode ) SELECT rc.ProductCode, @@ -1311,7 +1311,7 @@ func GetProductPricingPage(ctx context.Context, page int, limit int, filters Pro SELECT LTRIM(RTRIM(m.UrunKodu)) AS UrunKodu, CONVERT(VARCHAR(10), MAX(m.Tarihi), 23) AS LastCostingDate - FROM dbo.spUrtOnMLMas m WITH(NOLOCK) + FROM dbo.spUrtOnMLMas m INNER JOIN req_codes rc ON rc.ProductCode = LTRIM(RTRIM(m.UrunKodu)) GROUP BY LTRIM(RTRIM(m.UrunKodu)); diff --git a/svc/queries/product_pricing_dims_mssql.go b/svc/queries/product_pricing_dims_mssql.go index f77063a..5e560f9 100644 --- a/svc/queries/product_pricing_dims_mssql.go +++ b/svc/queries/product_pricing_dims_mssql.go @@ -14,7 +14,7 @@ SELECT DISTINCT LTRIM(RTRIM(ISNULL(V.ColorCode,''))) AS ColorCode, LTRIM(RTRIM(ISNULL(V.ItemDim1Code,''))) AS ItemDim1Code, LTRIM(RTRIM(ISNULL(V.ItemDim2Code,''))) AS ItemDim3Code -FROM prItemVariant V WITH(NOLOCK) +FROM prItemVariant V WHERE V.ItemTypeCode = 1 AND V.ItemCode = @ProductCode AND LEN(V.ItemCode) = 13 diff --git a/svc/queries/productattributes.go b/svc/queries/productattributes.go index 38d82b4..dd184f5 100644 --- a/svc/queries/productattributes.go +++ b/svc/queries/productattributes.go @@ -6,8 +6,8 @@ const GetProductAttributes = ` t.ItemTypeCode, t.AttributeTypeCode, ISNULL(NULLIF(td.AttributeTypeDescription, ''), CAST(t.AttributeTypeCode AS NVARCHAR(30))) AS AttributeTypeDescription - FROM dbo.cdItemAttributeType AS t WITH(NOLOCK) - LEFT JOIN dbo.cdItemAttributeTypeDesc AS td WITH(NOLOCK) + FROM dbo.cdItemAttributeType AS t + LEFT JOIN dbo.cdItemAttributeTypeDesc AS td ON td.ItemTypeCode = t.ItemTypeCode AND td.AttributeTypeCode = t.AttributeTypeCode AND td.LangCode = 'TR' @@ -21,8 +21,8 @@ Attr AS ( a.AttributeTypeCode, ISNULL(a.AttributeCode, '') AS AttributeCode, ISNULL(d.AttributeDescription, ISNULL(a.AttributeCode, '')) AS AttributeDescription - FROM dbo.cdItemAttribute AS a WITH(NOLOCK) - LEFT JOIN dbo.cdItemAttributeDesc AS d WITH(NOLOCK) + FROM dbo.cdItemAttribute AS a + LEFT JOIN dbo.cdItemAttributeDesc AS d ON d.ItemTypeCode = a.ItemTypeCode AND d.AttributeTypeCode = a.AttributeTypeCode AND d.AttributeCode = a.AttributeCode @@ -53,7 +53,7 @@ SELECT a.ItemTypeCode, a.AttributeTypeCode, ISNULL(a.AttributeCode, '') AS AttributeCode -FROM dbo.prItemAttribute AS a WITH(NOLOCK) +FROM dbo.prItemAttribute AS a WHERE a.ItemTypeCode = @p1 AND ISNULL(LTRIM(RTRIM(a.ItemCode)), '') = ISNULL(LTRIM(RTRIM(@p2)), '') ` diff --git a/svc/queries/productcolor.go b/svc/queries/productcolor.go index f438fe5..b746731 100644 --- a/svc/queries/productcolor.go +++ b/svc/queries/productcolor.go @@ -8,9 +8,9 @@ SELECT DISTINCT v.ColorCode, ISNULL(cd.ColorDescription, '') AS ColorDescription FROM ProductFilterWithDescription('TR') AS p -INNER JOIN prItemVariant AS v WITH(NOLOCK) +INNER JOIN prItemVariant AS v ON v.ItemCode = p.ProductCode -LEFT JOIN cdColorDesc AS cd WITH(NOLOCK) +LEFT JOIN cdColorDesc AS cd ON cd.ColorCode = v.ColorCode AND cd.LangCode = 'TR' WHERE diff --git a/svc/queries/productcolorsize.go b/svc/queries/productcolorsize.go index b6346b9..861ad4f 100644 --- a/svc/queries/productcolorsize.go +++ b/svc/queries/productcolorsize.go @@ -39,14 +39,14 @@ SELECT ISNULL(prItemVariant.ItemDim1Code, '') AS ItemDim1Code, ISNULL(prItemVariant.ItemDim2Code, '') AS ItemDim2Code FROM ProductFilterWithDescription('TR') AS Product -INNER JOIN cdItem WITH(NOLOCK) +INNER JOIN cdItem ON cdItem.ItemTypeCode = 1 AND cdItem.ItemCode = Product.ProductCode -LEFT JOIN prProductLot WITH(NOLOCK) +LEFT JOIN prProductLot ON prProductLot.ItemTypeCode = cdItem.ItemTypeCode AND prProductLot.ItemCode = cdItem.ItemCode AND prProductLot.IsDefault = 1 -LEFT JOIN prItemVariant WITH(NOLOCK) +LEFT JOIN prItemVariant ON prItemVariant.ItemCode = Product.ProductCode WHERE ProductAtt42 IN ('SERI','AKSESUAR') diff --git a/svc/queries/productnewcolor.go b/svc/queries/productnewcolor.go index bcc760e..ca4145b 100644 --- a/svc/queries/productnewcolor.go +++ b/svc/queries/productnewcolor.go @@ -5,8 +5,8 @@ SELECT CAST(@p1 AS NVARCHAR(30)) AS ProductCode, LTRIM(RTRIM(c.ColorCode)) AS ColorCode, ISNULL(NULLIF(LTRIM(RTRIM(cd.ColorDescription)), ''), ISNULL(NULLIF(LTRIM(RTRIM(c.ColorHex)), ''), LTRIM(RTRIM(c.ColorCode)))) AS ColorDescription -FROM dbo.cdColor AS c WITH(NOLOCK) -LEFT JOIN dbo.cdColorDesc AS cd WITH(NOLOCK) +FROM dbo.cdColor AS c +LEFT JOIN dbo.cdColorDesc AS cd ON cd.ColorCode = c.ColorCode AND cd.LangCode = 'TR' WHERE ISNULL(c.IsBlocked, 0) = 0 diff --git a/svc/queries/productnewsecondcolor.go b/svc/queries/productnewsecondcolor.go index 9c80ed2..2715367 100644 --- a/svc/queries/productnewsecondcolor.go +++ b/svc/queries/productnewsecondcolor.go @@ -6,8 +6,8 @@ SELECT LTRIM(RTRIM(ISNULL(@ColorCode, ''))) AS ColorCode, LTRIM(RTRIM(d2.ItemDim2Code)) AS ItemDim2Code, ISNULL(NULLIF(LTRIM(RTRIM(cd.ColorDescription)), ''), LTRIM(RTRIM(d2.ItemDim2Code))) AS ColorDescription -FROM dbo.cdItemDim2 AS d2 WITH(NOLOCK) -LEFT JOIN dbo.cdColorDesc AS cd WITH(NOLOCK) +FROM dbo.cdItemDim2 AS d2 +LEFT JOIN dbo.cdColorDesc AS cd ON cd.ColorCode = d2.ItemDim2Code AND cd.LangCode = 'TR' WHERE ISNULL(d2.IsBlocked, 0) = 0 diff --git a/svc/queries/productsecondcolor.go b/svc/queries/productsecondcolor.go index 124b625..9dfed2d 100644 --- a/svc/queries/productsecondcolor.go +++ b/svc/queries/productsecondcolor.go @@ -6,10 +6,10 @@ SELECT ISNULL(prItemVariant.ColorCode, '') AS ColorCode, ISNULL(prItemVariant.ItemDim2Code, '') AS ItemDim2Code, ISNULL(ColorDesc.ColorDescription, '') AS ColorDescription -FROM prItemVariant WITH(NOLOCK) +FROM prItemVariant INNER JOIN ProductFilterWithDescription('TR') AS Product ON prItemVariant.ItemCode = Product.ProductCode - LEFT JOIN cdColorDesc AS ColorDesc WITH(NOLOCK) + LEFT JOIN cdColorDesc AS ColorDesc ON ColorDesc.ColorCode = prItemVariant.ItemDim2Code AND ColorDesc.LangCode = 'TR' WHERE Product.ProductCode = @ProductCode diff --git a/svc/queries/productstockquery.go b/svc/queries/productstockquery.go index 8127d78..365a556 100644 --- a/svc/queries/productstockquery.go +++ b/svc/queries/productstockquery.go @@ -20,7 +20,7 @@ DECLARE @ProductCode NVARCHAR(50) = @p1; ItemDim2Code, ItemDim3Code, SUM(In_Qty1 - Out_Qty1) AS InventoryQty1 - FROM trStock WITH(NOLOCK) + FROM trStock WHERE ItemTypeCode = 1 AND ItemCode = @ProductCode AND LEN(ItemCode) = 13 @@ -184,25 +184,25 @@ AND DP.ItemDim1Code=S.ItemDim1Code AND DP.ItemDim2Code=S.ItemDim2Code AND DP.ItemDim3Code=S.ItemDim3Code -JOIN cdItem WITH(NOLOCK) +JOIN cdItem ON S.ItemCode = cdItem.ItemCode AND S.ItemTypeCode = cdItem.ItemTypeCode -LEFT JOIN cdUnitOfMeasure WITH(NOLOCK) +LEFT JOIN cdUnitOfMeasure ON cdItem.UnitOfMeasureCode1 = cdUnitOfMeasure.UnitOfMeasureCode LEFT JOIN ProductFilterWithDescription('TR') P ON P.ProductCode = S.ItemCode -LEFT JOIN bsItemTypeDesc WITH(NOLOCK) +LEFT JOIN bsItemTypeDesc ON bsItemTypeDesc.ItemTypeCode = S.ItemTypeCode AND bsItemTypeDesc.LangCode='TR' -LEFT JOIN cdWarehouseDesc W WITH(NOLOCK) +LEFT JOIN cdWarehouseDesc W ON W.WarehouseCode = S.WarehouseCode AND W.LangCode='TR' -LEFT JOIN cdColorDesc C WITH(NOLOCK) +LEFT JOIN cdColorDesc C ON C.ColorCode = S.ColorCode AND C.LangCode='TR' @@ -212,7 +212,7 @@ LEFT JOIN ( ItemTypeCode, Price, ROW_NUMBER() OVER (PARTITION BY ItemCode, ItemTypeCode ORDER BY PriceDate DESC) AS RowNum - FROM prItemBasePrice WITH(NOLOCK) + FROM prItemBasePrice ) prFilteredBasePrice ON prFilteredBasePrice.ItemCode = S.ItemCode AND prFilteredBasePrice.ItemTypeCode = S.ItemTypeCode diff --git a/svc/queries/wholesale_campaign_variants_mssql.go b/svc/queries/wholesale_campaign_variants_mssql.go index 3d37918..f261ff6 100644 --- a/svc/queries/wholesale_campaign_variants_mssql.go +++ b/svc/queries/wholesale_campaign_variants_mssql.go @@ -23,7 +23,7 @@ VARIANT_MASTER AS ( LTRIM(RTRIM(ISNULL(V.ColorCode,''))) AS ColorCode, LTRIM(RTRIM(ISNULL(V.ItemDim2Code,''))) AS ItemDim3Code, MAX(LTRIM(RTRIM(ISNULL(V.ItemDim1Code,'')))) AS ItemDim1Code - FROM prItemVariant V WITH(NOLOCK) + FROM prItemVariant V JOIN INP ON INP.ItemCode = V.ItemCode WHERE V.ItemTypeCode = 1 AND LEN(V.ItemCode) = 13 @@ -36,7 +36,7 @@ VARIANT_STOCK AS ( LTRIM(RTRIM(ISNULL(S.ColorCode,''))) AS ColorCode, LTRIM(RTRIM(ISNULL(S.ItemDim2Code,''))) AS ItemDim3Code, MAX(LTRIM(RTRIM(ISNULL(S.ItemDim1Code,'')))) AS ItemDim1Code - FROM trStock S WITH(NOLOCK) + FROM trStock S JOIN INP ON INP.ItemCode = S.ItemCode WHERE S.ItemTypeCode = 1 AND LEN(S.ItemCode) = 13 @@ -63,7 +63,7 @@ STOCK AS ( LTRIM(RTRIM(ISNULL(S.ItemDim2Code,''))) AS ItemDim3Code, MAX(LTRIM(RTRIM(ISNULL(S.ItemDim1Code,'')))) AS ItemDim1Code, SUM(S.In_Qty1 - S.Out_Qty1) AS InventoryQty1 - FROM trStock S WITH(NOLOCK) + FROM trStock S JOIN INP ON INP.ItemCode = S.ItemCode WHERE S.ItemTypeCode = 1 AND LEN(S.ItemCode) = 13 diff --git a/svc/routes/product_cditem.go b/svc/routes/product_cditem.go index f276e14..ed043cb 100644 --- a/svc/routes/product_cditem.go +++ b/svc/routes/product_cditem.go @@ -43,7 +43,7 @@ SELECT StoreCapacityLevelCode, CustomsTariffNumberCode, CompanyCode -FROM dbo.cdItem WITH(NOLOCK) +FROM dbo.cdItem WHERE ItemCode = @p1; ` row := db.MssqlDB.QueryRow(query, code) diff --git a/svc/routes/product_pricing_history.go b/svc/routes/product_pricing_history.go index 507c413..2800e43 100644 --- a/svc/routes/product_pricing_history.go +++ b/svc/routes/product_pricing_history.go @@ -160,7 +160,7 @@ SELECT TOP (400) CONVERT(VARCHAR(8), p.ValidTime, 108) AS ValidTime, CONVERT(VARCHAR(19), p.LastUpdatedDate, 120) AS LastUpdatedDate, CAST(ISNULL(p.IsDisabled, 0) AS BIT) AS IsDisabled -FROM dbo.trPriceListLine p WITH(NOLOCK) +FROM dbo.trPriceListLine p WHERE p.ItemTypeCode = 1 AND LTRIM(RTRIM(p.ItemCode)) = @p1 AND ` + wherePG + ` diff --git a/svc/routes/product_pricing_save.go b/svc/routes/product_pricing_save.go index 1946ec3..ba42529 100644 --- a/svc/routes/product_pricing_save.go +++ b/svc/routes/product_pricing_save.go @@ -900,7 +900,7 @@ FROM ( PARTITION BY LTRIM(RTRIM(PriceGroupCode)), LTRIM(RTRIM(DocCurrencyCode)) ORDER BY ValidDate DESC, ValidTime DESC, LastUpdatedDate DESC ) AS rn - FROM dbo.trPriceListLine WITH(NOLOCK) + FROM dbo.trPriceListLine WHERE ItemTypeCode = 1 AND LTRIM(RTRIM(ItemCode)) = @ItemCode AND ISNULL(IsDisabled, 0) = 0 @@ -970,7 +970,7 @@ WHERE rn = 1; var latestPrice sql.NullFloat64 _ = msTx.QueryRowContext(ctx, ` SELECT TOP (1) CAST(Price AS FLOAT) -FROM dbo.trPriceListLine WITH(NOLOCK) +FROM dbo.trPriceListLine WHERE ItemTypeCode = 1 AND LTRIM(RTRIM(ItemCode)) = @p1 AND LTRIM(RTRIM(DocCurrencyCode)) = @p2 @@ -988,7 +988,7 @@ ORDER BY ValidDate DESC, ValidTime DESC, LastUpdatedDate DESC; if nextSort <= 0 { _ = msTx.QueryRowContext(ctx, ` SELECT ISNULL(MAX(SortOrder), 0) + 1 -FROM dbo.trPriceListLine WITH(NOLOCK) +FROM dbo.trPriceListLine WHERE PriceListHeaderID = CONVERT(UNIQUEIDENTIFIER, @p1); `, sql.Named("p1", headerID)).Scan(&nextSort) if nextSort <= 0 {