Merge remote-tracking branch 'origin/master'

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)

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 + `

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 {