This commit is contained in:
seb
2026-07-16 10:00:17 +02:00
parent 886830cd83
commit b922229687
2 changed files with 6 additions and 3 deletions

View File

@@ -29,7 +29,8 @@ static const char* PRODUCT_LIST_SQL =
"a.nIstVater AS isParent, a.kVaterArtikel AS parentArticleId, " "a.nIstVater AS isParent, a.kVaterArtikel AS parentArticleId, "
"CASE WHEN a.kStueckliste <> 0 THEN '1' ELSE '0' END AS isCompositeProduct, " "CASE WHEN a.kStueckliste <> 0 THEN '1' ELSE '0' END AS isCompositeProduct, "
"(SELECT TOP 1 pv.cVariantName FROM Pos.vProductVariant pv " "(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 " "FROM dbo.tArtikel a "
"INNER JOIN dbo.tArtikelBeschreibung ab ON ab.kArtikel = a.kArtikel AND ab.kSprache = ? " "INNER JOIN dbo.tArtikelBeschreibung ab ON ab.kArtikel = a.kArtikel AND ab.kSprache = ? "
"LEFT JOIN TaxRates tr ON tr.kSteuerklasse = a.kSteuerklasse " "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"}, {"d_price", "0.0"},
{"tax_rate2", ""}, {"tax_rate2", ""},
{"use_in_out_tax", "0"}, {"use_in_out_tax", "0"},
{"barcode", nullptr}, {"barcode", row[13].str.empty() ? nullptr : nlohmann::json(row[13].str)},
{"use_stock", "0"}, {"use_stock", "0"},
{"q_div", "0"}, {"q_div", "0"},
{"quantity", "0"}, {"quantity", "0"},

View File

@@ -50,7 +50,8 @@ SELECT TOP (@limit)
SELECT TOP 1 pv.cVariantName SELECT TOP 1 pv.cVariantName
FROM Pos.vProductVariant pv FROM Pos.vProductVariant pv
WHERE pv.kProduct = a.kArtikel WHERE pv.kProduct = a.kArtikel
) AS variantName ) AS variantName,
a.cBarcode AS barcode
FROM dbo.tArtikel a FROM dbo.tArtikel a
INNER JOIN dbo.tArtikelBeschreibung ab ON ab.kArtikel = a.kArtikel AND ab.kSprache = @languageId INNER JOIN dbo.tArtikelBeschreibung ab ON ab.kArtikel = a.kArtikel AND ab.kSprache = @languageId
LEFT JOIN TaxRates tr ON tr.kSteuerklasse = a.kSteuerklasse 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, imghash: product.imgHash ?? null,
imgsrc: product.imgHash ?? null, imgsrc: product.imgHash ?? null,
sku: product.sku, sku: product.sku,
barcode: product.barcode ?? null,
name: product.name, name: product.name,
tax_rate: String(Math.round(Number(product.taxRate || 0))), tax_rate: String(Math.round(Number(product.taxRate || 0))),
price: basePrice, price: basePrice,