Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-24 19:05:26 +03:00
parent aca2cf5d02
commit 62bf272f17
22 changed files with 88 additions and 88 deletions

View File

@@ -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)