From b92222968737292d20f5dd567617906a8fe19430 Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 16 Jul 2026 10:00:17 +0200 Subject: [PATCH] barcode --- jtlsrv-cpp/src/queries/product_list.hpp | 5 +++-- src/queries/product-list.js | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jtlsrv-cpp/src/queries/product_list.hpp b/jtlsrv-cpp/src/queries/product_list.hpp index 159d145..a8c8a08 100644 --- a/jtlsrv-cpp/src/queries/product_list.hpp +++ b/jtlsrv-cpp/src/queries/product_list.hpp @@ -29,7 +29,8 @@ static const char* PRODUCT_LIST_SQL = "a.nIstVater AS isParent, a.kVaterArtikel AS parentArticleId, " "CASE WHEN a.kStueckliste <> 0 THEN '1' ELSE '0' END AS isCompositeProduct, " "(SELECT TOP 1 pv.cVariantName FROM Pos.vProductVariant pv " - "WHERE pv.kProduct = a.kArtikel) AS variantName " + "WHERE pv.kProduct = a.kArtikel) AS variantName, " + "a.cBarcode AS barcode " "FROM dbo.tArtikel a " "INNER JOIN dbo.tArtikelBeschreibung ab ON ab.kArtikel = a.kArtikel AND ab.kSprache = ? " "LEFT JOIN TaxRates tr ON tr.kSteuerklasse = a.kSteuerklasse " @@ -127,7 +128,7 @@ inline nlohmann::json get_product_list(int64_t cursor, int limit) { {"d_price", "0.0"}, {"tax_rate2", ""}, {"use_in_out_tax", "0"}, - {"barcode", nullptr}, + {"barcode", row[13].str.empty() ? nullptr : nlohmann::json(row[13].str)}, {"use_stock", "0"}, {"q_div", "0"}, {"quantity", "0"}, diff --git a/src/queries/product-list.js b/src/queries/product-list.js index 8f1115c..0c8f47f 100644 --- a/src/queries/product-list.js +++ b/src/queries/product-list.js @@ -50,7 +50,8 @@ SELECT TOP (@limit) SELECT TOP 1 pv.cVariantName FROM Pos.vProductVariant pv WHERE pv.kProduct = a.kArtikel - ) AS variantName + ) AS variantName, + a.cBarcode AS barcode FROM dbo.tArtikel a INNER JOIN dbo.tArtikelBeschreibung ab ON ab.kArtikel = a.kArtikel AND ab.kSprache = @languageId LEFT JOIN TaxRates tr ON tr.kSteuerklasse = a.kSteuerklasse @@ -149,6 +150,7 @@ export async function getProductList({ cursor = 0, limit = 20 } = {}) { imghash: product.imgHash ?? null, imgsrc: product.imgHash ?? null, sku: product.sku, + barcode: product.barcode ?? null, name: product.name, tax_rate: String(Math.round(Number(product.taxRate || 0))), price: basePrice,