From 62bf272f179298a8e6aacd0e016030bcc890d606 Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Wed, 24 Jun 2026 19:05:26 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- svc/queries/account.go | 4 +- svc/queries/customer_balance_list.go | 4 +- svc/queries/get_order_list_excel.go | 2 +- svc/queries/inventoryproduct.go | 22 ++++----- .../last10_avg_purchase_price_cache.go | 2 +- svc/queries/order_get.go | 6 +-- svc/queries/order_pdf.go | 2 +- svc/queries/order_write.go | 6 +-- svc/queries/orderinventory.go | 6 +-- svc/queries/orderlist.go | 2 +- svc/queries/orderproduction_items.go | 4 +- svc/queries/product_series.go | 6 +-- svc/queries/production_product_costing.go | 48 +++++++++---------- .../productstockquery_by_attributes.go | 18 +++---- svc/queries/statement_aging.go | 4 +- svc/queries/statement_header.go | 4 +- svc/queries/tbstok_exists_bulk.go | 4 +- svc/routes/order_mail.go | 6 +-- svc/routes/order_pdf.go | 6 +-- svc/routes/product_pricing_save.go | 2 +- svc/routes/production_product_costing.go | 16 +++---- svc/routes/production_product_costing_mail.go | 2 +- 22 files changed, 88 insertions(+), 88 deletions(-) diff --git a/svc/queries/account.go b/svc/queries/account.go index 7e91c85..1fee5d5 100644 --- a/svc/queries/account.go +++ b/svc/queries/account.go @@ -41,8 +41,8 @@ func GetAccounts(ctx context.Context) ([]models.Account, error) { c.CurrAccCode, a.AttributeTypeCode, a.AttributeCode - FROM cdCurrAcc c WITH (NOLOCK) - LEFT JOIN prCurrAccAttribute a WITH (NOLOCK) + FROM cdCurrAcc c + LEFT JOIN prCurrAccAttribute a ON a.CurrAccTypeCode = c.CurrAccTypeCode AND a.CurrAccCode = c.CurrAccCode WHERE c.CurrAccTypeCode = 1 diff --git a/svc/queries/customer_balance_list.go b/svc/queries/customer_balance_list.go index d2dd7f9..9e171b3 100644 --- a/svc/queries/customer_balance_list.go +++ b/svc/queries/customer_balance_list.go @@ -237,7 +237,7 @@ WITH BaseCari AS PARTITION BY LEFT(CB.CurrAccCode, 8) ORDER BY CB.CurrAccCode ) - FROM cdCurrAcc CB WITH (NOLOCK) + FROM cdCurrAcc CB WHERE CB.CurrAccTypeCode IN (1,3) AND LEFT(CB.CurrAccCode, 8) IN (%s) ), @@ -264,7 +264,7 @@ SELECT ILCE = ISNULL(CASE WHEN F.CurrAccTypeCode=1 THEN VDesc.VendorAtt07Desc ELSE CDesc.CustomerAtt07Desc END, ''), Risk_Durumu = ISNULL(CASE WHEN F.CurrAccTypeCode=1 THEN VDesc.VendorAtt03Desc ELSE CDesc.CustomerAtt03Desc END, '') FROM FirstCari F -LEFT JOIN cdCurrAccDesc cd WITH (NOLOCK) +LEFT JOIN cdCurrAccDesc cd ON cd.CurrAccTypeCode = F.CurrAccTypeCode AND cd.CurrAccCode = F.CurrAccCode AND cd.LangCode = 'TR' diff --git a/svc/queries/get_order_list_excel.go b/svc/queries/get_order_list_excel.go index 0105d36..720baaf 100644 --- a/svc/queries/get_order_list_excel.go +++ b/svc/queries/get_order_list_excel.go @@ -154,7 +154,7 @@ LEFT JOIN ( LEFT JOIN ( SELECT DISTINCT OrderLineID - FROM BAGGI_V3.dbo.trInvoiceLine WITH (NOLOCK) + FROM BAGGI_V3.dbo.trInvoiceLine WHERE OrderLineID IS NOT NULL ) il ON il.OrderLineID = l.OrderLineID diff --git a/svc/queries/inventoryproduct.go b/svc/queries/inventoryproduct.go index ac88ec5..aef3370 100644 --- a/svc/queries/inventoryproduct.go +++ b/svc/queries/inventoryproduct.go @@ -26,8 +26,8 @@ SELECT - (SUM(inv.ReserveQty1) + SUM(inv.DispOrderQty1) + SUM(inv.PickingQty1)), cdUnitOfMeasure.RoundDigit ) AS Kullanilabilir_Envanter -FROM cdItem WITH (NOLOCK) -JOIN cdUnitOfMeasure WITH (NOLOCK) +FROM cdItem +JOIN cdUnitOfMeasure ON cdItem.UnitOfMeasureCode1 = cdUnitOfMeasure.UnitOfMeasureCode JOIN ( SELECT @@ -40,19 +40,19 @@ JOIN ( FROM ( SELECT 'PickingStates' AS SourceTable, CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code, Qty1, 0 AS In_Qty1, 0 AS Out_Qty1 - FROM PickingStates WITH (NOLOCK) + FROM PickingStates UNION ALL SELECT 'ReserveStates', CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code, Qty1, 0, 0 - FROM ReserveStates WITH (NOLOCK) + FROM ReserveStates UNION ALL SELECT 'DispOrderStates', CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code, Qty1, 0, 0 - FROM DispOrderStates WITH (NOLOCK) + FROM DispOrderStates UNION ALL SELECT 'trStock', CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code, 0, SUM(In_Qty1), SUM(Out_Qty1) - FROM trStock WITH (NOLOCK) + FROM trStock GROUP BY CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code ) AS src @@ -61,18 +61,18 @@ JOIN ( ) AS inv ON cdItem.ItemTypeCode = inv.ItemTypeCode AND cdItem.ItemCode = inv.ItemCode -LEFT JOIN ProductAttributesFilter AS attr WITH (NOLOCK) +LEFT JOIN ProductAttributesFilter AS attr ON attr.ItemCode = inv.ItemCode -LEFT JOIN bsItemTypeDesc WITH (NOLOCK) +LEFT JOIN bsItemTypeDesc ON bsItemTypeDesc.ItemTypeCode = inv.ItemTypeCode AND bsItemTypeDesc.LangCode = 'TR' -LEFT JOIN cdWarehouseDesc AS wh WITH (NOLOCK) +LEFT JOIN cdWarehouseDesc AS wh ON wh.WarehouseCode = inv.WarehouseCode -LEFT JOIN cdItemDesc AS descItem WITH (NOLOCK) +LEFT JOIN cdItemDesc AS descItem ON descItem.ItemTypeCode = inv.ItemTypeCode AND descItem.ItemCode = inv.ItemCode AND descItem.LangCode = 'TR' -LEFT JOIN cdColorDesc AS descColor WITH (NOLOCK) +LEFT JOIN cdColorDesc AS descColor ON descColor.ColorCode = inv.ColorCode AND descColor.LangCode = 'TR' WHERE diff --git a/svc/queries/last10_avg_purchase_price_cache.go b/svc/queries/last10_avg_purchase_price_cache.go index bee2587..9af5665 100644 --- a/svc/queries/last10_avg_purchase_price_cache.go +++ b/svc/queries/last10_avg_purchase_price_cache.go @@ -58,7 +58,7 @@ SELECT T.avg_doc_price, CONVERT(varchar(10), T.min_invoice_date, 23) AS min_invoice_date, CONVERT(varchar(10), T.max_invoice_date, 23) AS max_invoice_date -FROM dbo.cache_last10_avg_purchase_price T WITH (NOLOCK) +FROM dbo.cache_last10_avg_purchase_price T INNER JOIN C ON C.ItemCode = T.ItemCode `, strings.Join(valParts, ",")) diff --git a/svc/queries/order_get.go b/svc/queries/order_get.go index dcc9738..bb68092 100644 --- a/svc/queries/order_get.go +++ b/svc/queries/order_get.go @@ -220,7 +220,7 @@ SELECT WHEN ISNULL(L.IsClosed, 0) = 1 OR EXISTS ( SELECT 1 - FROM BAGGI_V3.dbo.trInvoiceLine il WITH (NOLOCK) + FROM BAGGI_V3.dbo.trInvoiceLine il WHERE il.OrderLineID = L.OrderLineID ) THEN CAST(1 AS bit) @@ -237,10 +237,10 @@ SELECT P.ProductAtt38Desc AS Fit1, P.ProductAtt39Desc AS Fit2 FROM BAGGI_V3.dbo.trOrderLine AS L -LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD WITH (NOLOCK) +LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD ON CD.OrderLineID = L.OrderLineID AND CD.CurrencyCode = ISNULL(NULLIF(LTRIM(RTRIM(L.DocCurrencyCode)), ''), 'TRY') -LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CL WITH (NOLOCK) +LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CL ON CL.OrderLineID = L.OrderLineID AND CL.CurrencyCode = 'TRY' LEFT JOIN ProductFilterWithDescription('TR') AS P diff --git a/svc/queries/order_pdf.go b/svc/queries/order_pdf.go index f1730c3..c90c50b 100644 --- a/svc/queries/order_pdf.go +++ b/svc/queries/order_pdf.go @@ -115,7 +115,7 @@ SELECT L.VatCode, L.VatRate FROM BAGGI_V3.dbo.trOrderLine AS L -LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD WITH (NOLOCK) +LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD ON CD.OrderLineID = L.OrderLineID AND CD.CurrencyCode = ISNULL(NULLIF(LTRIM(RTRIM(L.DocCurrencyCode)), ''), 'TRY') LEFT JOIN ProductFilterWithDescription('TR') AS P diff --git a/svc/queries/order_write.go b/svc/queries/order_write.go index 57f817a..b820de9 100644 --- a/svc/queries/order_write.go +++ b/svc/queries/order_write.go @@ -492,7 +492,7 @@ func variantCacheKey(item, color, dim2 string) string { func loadVariantDim1SetTx(tx *sql.Tx, item, color, dim2 string) (map[string]struct{}, error) { rows, err := tx.Query(` SELECT ISNULL(LTRIM(RTRIM(V.ItemDim1Code)),'') AS ItemDim1Code - FROM BAGGI_V3.dbo.prItemVariant V WITH (NOLOCK) + FROM BAGGI_V3.dbo.prItemVariant V WHERE ISNULL(LTRIM(RTRIM(V.ItemCode)),'') = @p1 AND ( ( @@ -538,7 +538,7 @@ func loadVariantDim1SetTx(tx *sql.Tx, item, color, dim2 string) (map[string]stru func loadVariantDim1SetDB(conn *sql.DB, item, color, dim2 string) (map[string]struct{}, error) { rows, err := conn.Query(` SELECT ISNULL(LTRIM(RTRIM(V.ItemDim1Code)),'') AS ItemDim1Code - FROM BAGGI_V3.dbo.prItemVariant V WITH (NOLOCK) + FROM BAGGI_V3.dbo.prItemVariant V WHERE ISNULL(LTRIM(RTRIM(V.ItemCode)),'') = @p1 AND ( ( @@ -1396,7 +1396,7 @@ WHERE OrderHeaderID=@p1 err := tx.QueryRow(` SELECT CASE WHEN EXISTS ( SELECT 1 - FROM BAGGI_V3.dbo.trInvoiceLine WITH (NOLOCK) + FROM BAGGI_V3.dbo.trInvoiceLine WHERE OrderLineID=@p1 ) THEN 1 ELSE 0 END `, lineID).Scan(&exists) diff --git a/svc/queries/orderinventory.go b/svc/queries/orderinventory.go index a7c20b1..a6dceb1 100644 --- a/svc/queries/orderinventory.go +++ b/svc/queries/orderinventory.go @@ -44,8 +44,8 @@ SELECT cdUnitOfMeasure.RoundDigit ) AS Kullanilabilir_Envanter -FROM cdItem WITH (NOLOCK) -JOIN cdUnitOfMeasure WITH (NOLOCK) +FROM cdItem +JOIN cdUnitOfMeasure ON cdItem.UnitOfMeasureCode1 = cdUnitOfMeasure.UnitOfMeasureCode JOIN ( SELECT @@ -74,7 +74,7 @@ JOIN ( SELECT 'trStock', CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code, 0, SUM(In_Qty1), SUM(Out_Qty1) - FROM trStock WITH (NOLOCK) + FROM trStock GROUP BY CompanyCode, OfficeCode, StoreTypeCode, StoreCode, WarehouseCode, ItemTypeCode, ItemCode, ColorCode, ItemDim1Code, ItemDim2Code, ItemDim3Code ) AS SourceData diff --git a/svc/queries/orderlist.go b/svc/queries/orderlist.go index 7a5ec56..5528254 100644 --- a/svc/queries/orderlist.go +++ b/svc/queries/orderlist.go @@ -164,7 +164,7 @@ JOIN ( ON h2.OrderHeaderID = l.OrderHeaderID LEFT JOIN ( SELECT DISTINCT OrderLineID - FROM BAGGI_V3.dbo.trInvoiceLine WITH (NOLOCK) + FROM BAGGI_V3.dbo.trInvoiceLine WHERE OrderLineID IS NOT NULL ) il ON il.OrderLineID = l.OrderLineID diff --git a/svc/queries/orderproduction_items.go b/svc/queries/orderproduction_items.go index 615268e..7e94c15 100644 --- a/svc/queries/orderproduction_items.go +++ b/svc/queries/orderproduction_items.go @@ -28,7 +28,7 @@ SELECT ISNULL(l.ColorCode,'') AS OldColor, ISNULL(( SELECT TOP 1 LTRIM(RTRIM(cd.ColorDescription)) - FROM dbo.cdColorDesc cd WITH (NOLOCK) + FROM dbo.cdColorDesc cd WHERE cd.ColorCode = l.ColorCode AND cd.LangCode = N'TR' ), '') AS OldColorDescription, @@ -68,7 +68,7 @@ SELECT FROM dbo.trOrderLine l JOIN dbo.trOrderHeader h ON h.OrderHeaderID = l.OrderHeaderID -LEFT JOIN dbo.trOrderLineCurrency c WITH (NOLOCK) +LEFT JOIN dbo.trOrderLineCurrency c ON c.OrderLineID = l.OrderLineID AND c.CurrencyCode = ISNULL(h.DocCurrencyCode,'TRY') diff --git a/svc/queries/product_series.go b/svc/queries/product_series.go index 13b864b..a5fdd93 100644 --- a/svc/queries/product_series.go +++ b/svc/queries/product_series.go @@ -101,7 +101,7 @@ CREATE CLUSTERED INDEX IX_AttrFiltered_ProductCode ON #AttrFiltered(ProductCode) ( SELECT T.ItemCode, T.ColorCode, T.ItemDim1Code, T.ItemDim2Code, SUM(T.In_Qty1 - T.Out_Qty1) AS InventoryQty1, 0 AS PickingQty1, 0 AS ReserveQty1, 0 AS DispOrderQty1 - FROM trStock T WITH (NOLOCK) + FROM trStock T INNER JOIN #AttrFiltered AF ON AF.ProductCode = T.ItemCode WHERE T.ItemTypeCode = 1 AND LEN(T.ItemCode) = 13 @@ -144,7 +144,7 @@ Avail AS I.ItemDim2Code, CAST(ROUND(I.InventoryQty1 - I.PickingQty1 - I.ReserveQty1 - I.DispOrderQty1, 2) AS DECIMAL(18,2)) AS Qty FROM Inv I - JOIN cdItem CI WITH (NOLOCK) + JOIN cdItem CI ON CI.ItemTypeCode = 1 AND CI.ItemCode = I.ItemCode WHERE CI.IsBlocked = 0 @@ -190,7 +190,7 @@ JOIN Avail A AND A.ColorCode = G.ColorCode AND ISNULL(A.ItemDim2Code, '') = ISNULL(G.ItemDim2Code, '') JOIN #AttrFiltered AF ON AF.ProductCode = G.ItemCode -LEFT JOIN cdColorDesc C WITH (NOLOCK) +LEFT JOIN cdColorDesc C ON C.ColorCode = G.ColorCode AND C.LangCode = 'TR' ORDER BY G.ItemCode, G.ColorCode, G.ItemDim2Code, A.ItemDim1Code diff --git a/svc/queries/production_product_costing.go b/svc/queries/production_product_costing.go index 3bfb5b5..c56d3d9 100644 --- a/svc/queries/production_product_costing.go +++ b/svc/queries/production_product_costing.go @@ -59,7 +59,7 @@ func LookupFirmaIDByKodu(ctx context.Context, uretimDB *sql.DB, firmaKodu string } sqlText := ` SELECT TOP 1 ISNULL(F.nFirmaID, 0) AS nFirmaID -FROM dbo.tbFirma F WITH (NOLOCK) +FROM dbo.tbFirma F WHERE LTRIM(RTRIM(ISNULL(F.sKodu, ''))) = @p1 ORDER BY F.nFirmaID ` @@ -234,10 +234,10 @@ func UpsertV3ItemBasePriceUSD( var targetCountry string err := mssqlDB.QueryRowContext(ctx, ` SELECT TOP 1 C.CountryCode -FROM dbo.cdCountry C WITH (NOLOCK) +FROM dbo.cdCountry C WHERE C.CountryCode <> 'TR' AND NOT EXISTS ( - SELECT 1 FROM dbo.prItemBasePrice P WITH (NOLOCK) + SELECT 1 FROM dbo.prItemBasePrice P WHERE P.ItemTypeCode = 1 AND LTRIM(RTRIM(P.ItemCode)) = LTRIM(RTRIM(@p1)) AND P.BasePriceCode = 1 @@ -448,7 +448,7 @@ func GetProductionProductCostingMTBolumOptions(ctx context.Context, uretimDB *sq SELECT TOP (@p2) ISNULL(B.nUrtMTBolumID, 0) AS nUrtMTBolumID, ISNULL(B.sAdi, '') AS sAdi -FROM dbo.spUrtMTBolum B WITH (NOLOCK) +FROM dbo.spUrtMTBolum B WHERE ISNULL(B.bAktif, 0) = 1 AND ISNULL(B.nUrtTipiID, 0) = 1 AND (@p1 = '' OR ISNULL(B.sAdi, '') LIKE @p3 OR CONVERT(VARCHAR(32), ISNULL(B.nUrtMTBolumID, 0)) LIKE @p3) @@ -477,15 +477,15 @@ SELECT CAST(CASE WHEN ISNULL(M.bAktif, 0) = 1 THEN 1 ELSE 0 END AS bit) AS bAktif, CONVERT(VARCHAR(16), M.dteIslemTarihi, 120) AS dteIslemTarihi, ISNULL(M.sKullaniciAdi, '') AS sKullaniciAdi -FROM dbo.mk_MaliyetParcaEslestirme M WITH (NOLOCK) -LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK) +FROM dbo.mk_MaliyetParcaEslestirme M +LEFT JOIN dbo.spUrtMTBolum B ON B.nUrtMTBolumID = M.nUrtMTBolumID AND ISNULL(B.nUrtTipiID, 0) = 1 OUTER APPLY ( SELECT STUFF(( SELECT ',' + LTRIM(RTRIM(CONVERT(VARCHAR(32), X.nHammaddeTuruNo))) - FROM dbo.mk_MaliyetParcaEslestirme_HammaddeTuru X WITH (NOLOCK) + FROM dbo.mk_MaliyetParcaEslestirme_HammaddeTuru X WHERE X.mapping_id = M.id ORDER BY X.nHammaddeTuruNo FOR XML PATH(''), TYPE @@ -630,7 +630,7 @@ SELECT ISNULL(H.nHammaddeTuruNo, 0) AS nHammaddeTuruNo, ISNULL(H.sAciklama, '') AS sAciklama, ISNULL(H.MTnUrtMTBolumID, 0) AS MTnUrtMTBolumID -FROM dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK) +FROM dbo.spUrtOnMLHammaddeTuru H WHERE H.nHammaddeTuruNo IN (%s) `, strings.Join(ph, ",")) @@ -954,7 +954,7 @@ func GetProductionHasCostDetailRowsByOnMLNo( ON T.nHammaddeTuruNo = D.nHammaddeTuruNo LEFT JOIN dbo.spUrtMTBolum B ON B.nUrtMTBolumID = D.nUrtMTBolumID - LEFT JOIN dbo.tbStok SX WITH (NOLOCK) + LEFT JOIN dbo.tbStok SX ON (SX.IsBlocked = 0 OR SX.IsBlocked IS NULL) AND ISNULL(SX.sKodu,'') = ISNULL(D.sKodu,'') WHERE D.nOnMLNo = @p1 @@ -1168,7 +1168,7 @@ HammaddeTekil AS ( CASE WHEN H.MTnUrtMTBolumID = RMik.nUrtMTBolumID THEN 0 ELSE 1 END, H.nHammaddeTuruNo ) HT - LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK) + LEFT JOIN dbo.spUrtMTBolum B ON B.nUrtMTBolumID = HT.MTnUrtMTBolumID AND ISNULL(B.nUrtTipiID, 0) = 1 WHERE HT.nHammaddeTuruNo IS NOT NULL @@ -1246,8 +1246,8 @@ func GetProductionHasCostDetailHammaddeTypeOptions( COALESCE(NULLIF(LTRIM(RTRIM(T.sAciklama3)), ''), NULLIF(LTRIM(RTRIM(T.sAciklama2)), ''), N'TANIMSIZ') AS sAciklama3, ISNULL(T.MTnUrtMTBolumID, 0) AS mtUrtMTBolumID, ISNULL(B.sAdi, '') AS sParcaAdi - FROM dbo.spUrtOnMLHammaddeTuru T WITH (NOLOCK) - LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK) + FROM dbo.spUrtOnMLHammaddeTuru T + LEFT JOIN dbo.spUrtMTBolum B ON B.nUrtMTBolumID = T.MTnUrtMTBolumID AND ISNULL(B.nUrtTipiID, 0) = 1 WHERE @@ -1320,10 +1320,10 @@ SELECT ISNULL(T.sAciklama, '') AS sAciklama, ISNULL(T.MTnUrtMTBolumID, 0) AS mtUrtMTBolumID, ISNULL(B.sAdi, '') AS sParcaAdi -FROM dbo.spUrtOnMLHammaddeTuru T WITH (NOLOCK) +FROM dbo.spUrtOnMLHammaddeTuru T INNER JOIN req R ON R.nHammaddeTuruNo = T.nHammaddeTuruNo -LEFT JOIN dbo.spUrtMTBolum B WITH (NOLOCK) +LEFT JOIN dbo.spUrtMTBolum B ON B.nUrtMTBolumID = T.MTnUrtMTBolumID AND ISNULL(B.nUrtTipiID, 0) = 1 WHERE ISNULL(T.bAktif, 0) = 1 @@ -1373,8 +1373,8 @@ SELECT TOP (@p3) -- We intentionally don't depend on mk_MaliyetParcaEslestirme_vmiktarlar.bAktif -- to keep this feature robust across schema changes; only active hammadde types are listed. CAST(1 AS bit) AS bAktif -FROM dbo.mk_MaliyetParcaEslestirme_vmiktarlar V WITH (NOLOCK) -LEFT JOIN dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK) +FROM dbo.mk_MaliyetParcaEslestirme_vmiktarlar V +LEFT JOIN dbo.spUrtOnMLHammaddeTuru H ON H.nHammaddeTuruNo = V.nHammaddeTuruNo WHERE (@p1 = '' OR CONVERT(VARCHAR(32), ISNULL(V.nHammaddeTuruNo, 0)) LIKE @p2) @@ -1427,8 +1427,8 @@ func RefreshProductionProductCostingDefaultQty(ctx context.Context, uretimDB *sq D.dteIslemTarihi DESC, D.nOnMLDetNo DESC ) AS rn - FROM dbo.spUrtOnMLMasDet D WITH (NOLOCK) - INNER JOIN dbo.spUrtOnMLMas M WITH (NOLOCK) + FROM dbo.spUrtOnMLMasDet D + INNER JOIN dbo.spUrtOnMLMas M ON M.nOnMLNo = D.nOnMLNo WHERE ISNULL(D.lMiktar, 0) > 0 AND ISNULL(M.bIptal, 0) = 0 @@ -1470,8 +1470,8 @@ func CalcProductionProductCostingDefaultQtyFromLastOnML(ctx context.Context, ure ;WITH ranked AS ( SELECT TOP (@p2) ISNULL(D.lMiktar, 0) AS lMiktar - FROM dbo.spUrtOnMLMasDet D WITH (NOLOCK) - INNER JOIN dbo.spUrtOnMLMas M WITH (NOLOCK) + FROM dbo.spUrtOnMLMasDet D + INNER JOIN dbo.spUrtOnMLMas M ON M.nOnMLNo = D.nOnMLNo WHERE D.nHammaddeTuruNo = @p1 AND ISNULL(D.lMiktar, 0) > 0 @@ -1535,9 +1535,9 @@ WITH req(nHammaddeTuruNo) AS ( ISNULL(H.sAciklama, '') AS sAciklama, CAST(ISNULL(V.lDefaultMiktar, 0) AS FLOAT) AS lDefaultMiktar FROM req R -INNER JOIN dbo.mk_MaliyetParcaEslestirme_vmiktarlar V WITH (NOLOCK) +INNER JOIN dbo.mk_MaliyetParcaEslestirme_vmiktarlar V ON V.nHammaddeTuruNo = R.nHammaddeTuruNo -INNER JOIN dbo.spUrtOnMLHammaddeTuru H WITH (NOLOCK) +INNER JOIN dbo.spUrtOnMLHammaddeTuru H ON H.nHammaddeTuruNo = V.nHammaddeTuruNo WHERE ISNULL(H.bAktif, 0) = 1; ` @@ -1653,8 +1653,8 @@ ranked AS ( M.nOnMLNo DESC, D.nOnMLDetNo DESC ) AS rn - FROM dbo.spUrtOnMLMasDet D WITH (NOLOCK) - INNER JOIN dbo.spUrtOnMLMas M WITH (NOLOCK) + FROM dbo.spUrtOnMLMasDet D + INNER JOIN dbo.spUrtOnMLMas M ON M.nOnMLNo = D.nOnMLNo INNER JOIN req R ON R.nHammaddeTuruNo = D.nHammaddeTuruNo diff --git a/svc/queries/productstockquery_by_attributes.go b/svc/queries/productstockquery_by_attributes.go index 55837e2..c1909c6 100644 --- a/svc/queries/productstockquery_by_attributes.go +++ b/svc/queries/productstockquery_by_attributes.go @@ -130,7 +130,7 @@ CREATE NONCLUSTERED INDEX IX_AttrBase_Filter ON #AttrBase(Kategori, UrunAnaGrubu SELECT T.ItemCode, T.ColorCode, T.ItemDim1Code, T.ItemDim2Code, 0, 0, 0, SUM(T.In_Qty1 - T.Out_Qty1) - FROM trStock T WITH (NOLOCK) + FROM trStock T INNER JOIN #AttrBase AB ON AB.ProductCode = T.ItemCode WHERE T.ItemTypeCode = 1 AND LEN(T.ItemCode) = 13 @@ -148,7 +148,7 @@ Avail AS Beden = LTRIM(RTRIM(I.ItemDim1Code)), Kullanilabilir = (I.InventoryQty1 - I.PickingQty1 - I.ReserveQty1 - I.DispOrderQty1) FROM INV I - LEFT JOIN cdColorDesc C WITH (NOLOCK) + LEFT JOIN cdColorDesc C ON C.ColorCode = I.ColorCode AND C.LangCode = 'TR' WHERE (I.InventoryQty1 - I.PickingQty1 - I.ReserveQty1 - I.DispOrderQty1) > 0 @@ -543,7 +543,7 @@ INV AS T.CompanyCode, T.OfficeCode, T.StoreTypeCode, T.StoreCode, T.WarehouseCode, T.ItemTypeCode, T.ItemCode, T.ColorCode, T.ItemDim1Code, T.ItemDim2Code, T.ItemDim3Code, 0, 0, 0, SUM(T.In_Qty1 - T.Out_Qty1) - FROM trStock T WITH (NOLOCK) + FROM trStock T INNER JOIN #AttrFiltered AF ON AF.ProductCode = T.ItemCode WHERE T.ItemTypeCode = 1 AND LEN(T.ItemCode) = 13 @@ -578,12 +578,12 @@ Avail AS Kullanilabilir = ROUND(I.InventoryQty1 - I.PickingQty1 - I.ReserveQty1 - I.DispOrderQty1, U.RoundDigit), RenkAciklama = LTRIM(RTRIM(C.ColorDescription)) FROM INV I - JOIN cdItem CI WITH (NOLOCK) + JOIN cdItem CI ON CI.ItemTypeCode = I.ItemTypeCode AND CI.ItemCode = I.ItemCode - LEFT JOIN cdUnitOfMeasure U WITH (NOLOCK) + LEFT JOIN cdUnitOfMeasure U ON U.UnitOfMeasureCode = CI.UnitOfMeasureCode1 - LEFT JOIN cdColorDesc C WITH (NOLOCK) + LEFT JOIN cdColorDesc C ON C.ColorCode = I.ColorCode AND C.LangCode = 'TR' WHERE I.ItemTypeCode = 1 @@ -670,15 +670,15 @@ INNER JOIN Grouped G AND ISNULL(G.ItemDim2Code, '') = ISNULL(A.ItemDim2Code, '') INNER JOIN #AttrFiltered AF ON AF.ProductCode = A.ItemCode -LEFT JOIN cdWarehouseDesc W WITH (NOLOCK) +LEFT JOIN cdWarehouseDesc W ON W.WarehouseCode = A.WarehouseCode AND W.LangCode = 'TR' -LEFT JOIN bsItemTypeDesc IT WITH (NOLOCK) +LEFT JOIN bsItemTypeDesc IT ON IT.ItemTypeCode = A.ItemTypeCode AND IT.LangCode = 'TR' OUTER APPLY ( SELECT TOP 1 Price - FROM prItemBasePrice PB WITH (NOLOCK) + FROM prItemBasePrice PB WHERE PB.ItemTypeCode = 1 AND PB.ItemCode = A.ItemCode AND LEN(PB.ItemCode) = 13 diff --git a/svc/queries/statement_aging.go b/svc/queries/statement_aging.go index 7571643..dac7958 100644 --- a/svc/queries/statement_aging.go +++ b/svc/queries/statement_aging.go @@ -159,7 +159,7 @@ WITH BaseCari AS ( PARTITION BY LEFT(CurrAccCode, 8) ORDER BY CurrAccCode ) - FROM cdCurrAcc WITH (NOLOCK) + FROM cdCurrAcc WHERE CurrAccTypeCode IN (1,3) AND LEFT(CurrAccCode, 8) IN (%s) ) @@ -167,7 +167,7 @@ SELECT b.MasterCari, CariDetay = ISNULL(d.CurrAccDescription, '') FROM BaseCari b -LEFT JOIN cdCurrAccDesc d WITH (NOLOCK) +LEFT JOIN cdCurrAccDesc d ON d.CurrAccTypeCode = b.CurrAccTypeCode AND d.CurrAccCode = b.CurrAccCode AND d.LangCode = 'TR' diff --git a/svc/queries/statement_header.go b/svc/queries/statement_header.go index f4fcc4d..3e5ef83 100644 --- a/svc/queries/statement_header.go +++ b/svc/queries/statement_header.go @@ -46,7 +46,7 @@ func GetStatements(ctx context.Context, params models.StatementParams) ([]models ( (b.CurrAccTypeCode = 3 AND EXISTS ( SELECT 1 - FROM CustomerAttributesFilter PF WITH (NOLOCK) + FROM CustomerAttributesFilter PF WHERE (PF.CurrAccCode = b.CurrAccCode OR LEFT(PF.CurrAccCode, 8) = LEFT(b.CurrAccCode, 8)) AND %s )) @@ -57,7 +57,7 @@ func GetStatements(ctx context.Context, params models.StatementParams) ([]models SELECT CurrAccCode, VendorAtt01 = MAX(CASE WHEN AttributeTypeCode = 1 THEN AttributeCode END) - FROM prCurrAccAttribute WITH (NOLOCK) + FROM prCurrAccAttribute WHERE CurrAccTypeCode = 1 GROUP BY CurrAccCode ) VF diff --git a/svc/queries/tbstok_exists_bulk.go b/svc/queries/tbstok_exists_bulk.go index 39eb69b..d34013a 100644 --- a/svc/queries/tbstok_exists_bulk.go +++ b/svc/queries/tbstok_exists_bulk.go @@ -64,13 +64,13 @@ WITH C AS ( HIT AS ( SELECT DISTINCT C.code FROM C - JOIN dbo.tbStok S WITH (NOLOCK) + JOIN dbo.tbStok S ON S.sKodu = C.code OR S.sKodu = C.code_nospace UNION SELECT DISTINCT C.code FROM C - JOIN dbo.tbStok S WITH (NOLOCK) + JOIN dbo.tbStok S ON S.sModel = C.code ) SELECT diff --git a/svc/routes/order_mail.go b/svc/routes/order_mail.go index d3cebc5..794b501 100644 --- a/svc/routes/order_mail.go +++ b/svc/routes/order_mail.go @@ -215,10 +215,10 @@ SELECT TOP (1) ISNULL(h.CurrAccCode, ''), ISNULL(LTRIM(RTRIM(f.CustomerAtt01)), '') AS MarketCode, ISNULL(py.AttributeDescription, '') AS MarketTitle -FROM BAGGI_V3.dbo.trOrderHeader h WITH (NOLOCK) -LEFT JOIN BAGGI_V3.dbo.CustomerAttributesFilter f WITH (NOLOCK) +FROM BAGGI_V3.dbo.trOrderHeader h +LEFT JOIN BAGGI_V3.dbo.CustomerAttributesFilter f ON f.CurrAccCode = h.CurrAccCode -LEFT JOIN BAGGI_V3.dbo.cdCurrAccAttributeDesc py WITH (NOLOCK) +LEFT JOIN BAGGI_V3.dbo.cdCurrAccAttributeDesc py ON py.CurrAccTypeCode = h.CurrAccTypeCode AND py.AttributeTypeCode = 1 AND py.AttributeCode = f.CustomerAtt01 diff --git a/svc/routes/order_pdf.go b/svc/routes/order_pdf.go index d6b1bc0..e8bbc44 100644 --- a/svc/routes/order_pdf.go +++ b/svc/routes/order_pdf.go @@ -691,7 +691,7 @@ func getOrderHeaderFromDB(db *sql.DB, orderID string) (*OrderHeader, error) { h.CreatedUserName, ISNULL(( SELECT TOP (1) ca.AttributeDescription - FROM BAGGI_V3.dbo.cdCurrAccAttributeDesc AS ca WITH (NOLOCK) + FROM BAGGI_V3.dbo.cdCurrAccAttributeDesc AS ca WHERE ca.CurrAccTypeCode IN (1,3) AND ca.AttributeTypeCode = 2 -- 🟡 Müşteri Temsilcisi AND ca.AttributeCode = f.CustomerAtt02 @@ -764,7 +764,7 @@ func getOrderLinesFromDB(db *sql.DB, orderID string) ([]OrderLineRaw, error) { WHEN ISNULL(L.IsClosed, 0) = 1 OR EXISTS ( SELECT 1 - FROM BAGGI_V3.dbo.trInvoiceLine il WITH (NOLOCK) + FROM BAGGI_V3.dbo.trInvoiceLine il WHERE il.OrderLineID = L.OrderLineID ) THEN CAST(1 AS bit) @@ -777,7 +777,7 @@ func getOrderLinesFromDB(db *sql.DB, orderID string) ([]OrderLineRaw, error) { L.VatCode, L.VatRate FROM BAGGI_V3.dbo.trOrderLine AS L - LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD WITH (NOLOCK) + LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD ON CD.OrderLineID = L.OrderLineID AND CD.CurrencyCode = ISNULL(NULLIF(LTRIM(RTRIM(L.DocCurrencyCode)), ''), 'TRY') LEFT JOIN ProductFilterWithDescription('TR') AS P diff --git a/svc/routes/product_pricing_save.go b/svc/routes/product_pricing_save.go index 4c9ec24..1946ec3 100644 --- a/svc/routes/product_pricing_save.go +++ b/svc/routes/product_pricing_save.go @@ -213,7 +213,7 @@ VALUES ( // Re-read header id. err = tx.QueryRowContext(ctx, ` SELECT TOP (1) CONVERT(NVARCHAR(36), PriceListHeaderID) -FROM dbo.trPriceListHeader WITH (NOLOCK) +FROM dbo.trPriceListHeader WHERE CompanyCode = 1 AND LTRIM(RTRIM(PriceGroupCode)) = @pg AND LTRIM(RTRIM(DocCurrencyCode)) = @cur diff --git a/svc/routes/production_product_costing.go b/svc/routes/production_product_costing.go index b8446b2..760f131 100644 --- a/svc/routes/production_product_costing.go +++ b/svc/routes/production_product_costing.go @@ -1494,7 +1494,7 @@ func postProductionProductCostingOnMLSaveHandler(w http.ResponseWriter, r *http. isUpdate := false { var flag int - _ = tx.QueryRowContext(ctx, `SELECT CASE WHEN EXISTS (SELECT 1 FROM dbo.spUrtOnMLMas WITH (NOLOCK) WHERE nOnMLNo=@p1) THEN 1 ELSE 0 END`, nOnMLNo).Scan(&flag) + _ = tx.QueryRowContext(ctx, `SELECT CASE WHEN EXISTS (SELECT 1 FROM dbo.spUrtOnMLMas WHERE nOnMLNo=@p1) THEN 1 ELSE 0 END`, nOnMLNo).Scan(&flag) isUpdate = flag == 1 } @@ -1644,7 +1644,7 @@ SELECT C.code, ISNULL(( SELECT TOP 1 ISNULL(CONVERT(int, ISNULL(S.nStokTipi, 0)), 0) AS nStokTipiID - FROM dbo.tbStok S WITH (NOLOCK) + FROM dbo.tbStok S WHERE ISNULL(S.IsBlocked, 0) = 0 AND ( REPLACE(LTRIM(RTRIM(ISNULL(S.sKodu,''))), ' ', '') = REPLACE(C.code, ' ', '') @@ -1739,7 +1739,7 @@ FROM C var mtID int err := tx.QueryRowContext(ctx, ` SELECT TOP 1 ISNULL(MTnUrtMTBolumID, 0) AS MTnUrtMTBolumID -FROM dbo.spUrtOnMLHammaddeTuru WITH (NOLOCK) +FROM dbo.spUrtOnMLHammaddeTuru WHERE nHammaddeTuruNo = @p1 `, row.NHammaddeTuruNo).Scan(&mtID) if err != nil && err != sql.ErrNoRows { @@ -1834,7 +1834,7 @@ WHERE nHammaddeTuruNo = @p1 perRowCtx, cancel := context.WithTimeout(ctx, 2*time.Second) err := lookupDB.QueryRowContext(perRowCtx, ` SELECT TOP 1 ISNULL(CONVERT(int, ISNULL(S.nStokTipi, 0)), 0) AS nStokTipiID -FROM dbo.tbStok S WITH (NOLOCK) +FROM dbo.tbStok S WHERE ISNULL(S.IsBlocked, 0) = 0 AND ( REPLACE(LTRIM(RTRIM(ISNULL(S.sKodu,''))), ' ', '') = REPLACE(@p1, ' ', '') @@ -2009,7 +2009,7 @@ WHEN NOT MATCHED THEN nUrtUBolumID := 13 _ = tx.QueryRowContext(ctx, ` SELECT TOP 1 ISNULL(CONVERT(int, nUrtUBolumID), 0) AS nUrtUBolumID -FROM dbo.spUrtRecMBolum WITH (NOLOCK) +FROM dbo.spUrtRecMBolum WHERE nUrtReceteID = @p1 ORDER BY nUrtRecMBolumID ASC `, req.Header.NUrtReceteID).Scan(&nUrtUBolumID) @@ -2024,7 +2024,7 @@ SELECT ISNULL(CONVERT(int, nUrtMBolumID), 0) AS nUrtMBolumID, LTRIM(RTRIM(ISNULL(nHStokID_G,''))) AS nHStokID_G, ISNULL(CONVERT(float, lHMiktar_G), 0) AS lHMiktar_G -FROM dbo.spUrtRecMBolum WITH (NOLOCK) +FROM dbo.spUrtRecMBolum WHERE nUrtReceteID = @p1 `, req.Header.NUrtReceteID); err == nil { for rows.Next() { @@ -2090,7 +2090,7 @@ FROM dbo.spUrtRecMBolum WITH (UPDLOCK, HOLDLOCK) // FK guard: only insert if nUrtMBolumID exists in spUrtMBolum. var bolumExists int if err := tx.QueryRowContext(ctx, ` -SELECT CASE WHEN EXISTS (SELECT 1 FROM dbo.spUrtMBolum WITH (NOLOCK) WHERE nUrtMBolumID = @p1) THEN 1 ELSE 0 END +SELECT CASE WHEN EXISTS (SELECT 1 FROM dbo.spUrtMBolum WHERE nUrtMBolumID = @p1) THEN 1 ELSE 0 END `, k.nUrtMBolumID).Scan(&bolumExists); err != nil || bolumExists != 1 { logger.Error("recipe insert blocked (missing spUrtMBolum FK)", "trace_id", traceID, "n_urt_m_bolum_id", k.nUrtMBolumID, "s_kodu", k.sKodu, "err", err) http.Error(w, "Recete insert engellendi (bolum FK yok)", http.StatusBadRequest) @@ -2468,7 +2468,7 @@ func PostProductionProductCostingOnMLDeleteHandler(w http.ResponseWriter, r *htt SELECT TOP 1 LTRIM(RTRIM(ISNULL(UrunKodu,''))) AS UrunKodu, COALESCE(Tarihi, dteKayitTarihi, GETDATE()) AS Tarihi -FROM dbo.spUrtOnMLMas WITH (NOLOCK) +FROM dbo.spUrtOnMLMas WHERE nOnMLNo = @p1 `, req.NOnMLNo).Scan(&urunKodu, &maliyetTarihi) if err != nil { diff --git a/svc/routes/production_product_costing_mail.go b/svc/routes/production_product_costing_mail.go index 1987556..8cc2f99 100644 --- a/svc/routes/production_product_costing_mail.go +++ b/svc/routes/production_product_costing_mail.go @@ -298,7 +298,7 @@ func sendCostingSummaryMail( WITH X AS (SELECT CONVERT(int, V.id) AS id FROM (VALUES %s) AS V(id)) SELECT X.id, LTRIM(RTRIM(ISNULL(M.sAdi,''))) AS title FROM X -LEFT JOIN dbo.spUrtMTBolum M WITH (NOLOCK) +LEFT JOIN dbo.spUrtMTBolum M ON M.nUrtMTBolumID = X.id `, strings.Join(vals, ",")) rows, err := uretim.QueryContext(ctx, q, args...)