@flowselections/logistiek-engine 1.0.94 → 1.0.98

package/dist-lib/lib/shippingNoteQueue.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shippingNoteQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/shippingNoteQueue.server.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,eAAe;IAC9B,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAqCD,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,eAAe,CAAC,CAmU1B"}
+{"version":3,"file":"shippingNoteQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/shippingNoteQueue.server.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,MAAM,WAAW,eAAe;IAC9B,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAqCD,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,eAAe,CAAC,CA+S1B"}

package/dist-lib/lib/shippingNoteQueue.server.js

@@ -13,6 +13,7 @@
 // ============================================================================
 import { trace, newTraceId, classifyError } from "./trace.server.js";
 import { FLOW_NODE } from "./flowNodes.js";
+import { printViaLayout } from "./layoutPrint.server.js";
 /** Na dit aantal pogingen is een aanvraag definitief mislukt. */
 const MAX_ATTEMPTS = 60;
 function pickPdf(result) {
@@ -215,10 +216,10 @@ export async function runShippingNoteQueue(sb, options = {}) {
                 await wacht("Wachten op officiële Floriday-afleverbrief: Floriday gaf nog geen bruikbaar bestand terug.", "nog_niet_beschikbaar");
                 continue;
             }
-            // De pakbon is de bron voor printer en kar.
+            // De pakbon is de bron voor printplek en kar; de printer kiest de Layout maker.
             const { data: slip } = await sb
                 .from("print_jobs")
-                .select("payload, printer_id, documentnaam, is_herprint")
+                .select("payload, is_herprint")
                 .eq("id", row.slip_job_id)
                 .maybeSingle();
             const slipRow = (slip ?? null);
@@ -227,56 +228,46 @@ export async function runShippingNoteQueue(sb, options = {}) {
                 continue;
             }
             const slipPayload = slipRow["payload"] ?? {};
-            const printerId = slipRow["printer_id"] ?? null;
+            const printPlekId = String(slipPayload["print_plek_id"] ?? "").trim() || null;
             const cartId = slipPayload["cart_id"] ?? row.cart_id;
-            if (!printerId) {
-                await wacht("De pakbon heeft nog geen printer toegewezen gekregen; de verzendbrief wacht op dezelfde printer.", "tijdelijk");
-                continue;
-            }
-            const idempotentie = `verzendbrief-bij-pakbon:${row.slip_job_id}`;
-            const { data: bestaand } = await sb
-                .from("print_jobs")
-                .select("id")
-                .eq("idempotentie_sleutel", idempotentie)
-                .maybeSingle();
-            let jobId = bestaand?.["id"] ?? null;
-            if (!jobId) {
-                const { data: job, error: jobError } = await sb
-                    .from("print_jobs")
-                    .insert({
-                    printer_id: printerId,
-                    documenttype: "afleverbrief",
-                    documentnaam: `Verzendbrief ${row.order_number}`,
-                    status: "wachtend",
-                    idempotentie_sleutel: idempotentie,
-                    pdf_base64: base64,
-                    pdf_url: url,
-                    herkomst: "logistiek-engine",
-                    gebruiker_naam: "Pickstation",
-                    is_herprint: Boolean(slipRow["is_herprint"] ?? false),
-                    payload: {
-                        ...slipPayload,
-                        source: "pickstation",
-                        document_type_code: "verzendbrief",
-                        documentType: "verzendbrief",
-                        trigger: "with_packing_slip",
-                        is_floriday: true,
-                        packing_slip_job_id: row.slip_job_id,
-                        print_batch_key: row.batch_key ?? `kar-print:${row.slip_job_id}`,
-                        order_id: row.order_id,
-                        order_number: row.order_number,
-                        cart_id: cartId,
-                        fulfillment_order_id: fulfillmentOrderId,
-                    },
-                })
-                    .select("id")
-                    .maybeSingle();
-                if (jobError) {
-                    await wacht(`De verzendbrief kon nog niet worden klaargezet om te printen: ${jobError.message}`, "tijdelijk");
-                    continue;
+            const printed = await printViaLayout(sb, {
+                documenttype: "afleverbrief",
+                documentnaam: `Verzendbrief ${row.order_number}`,
+                pdfBase64: base64,
+                pdfUrl: url,
+                printPlekId,
+                herkomst: "floriday",
+                isHerprint: Boolean(slipRow["is_herprint"] ?? false),
+                idempotentieSleutel: `verzendbrief-bij-pakbon:${row.slip_job_id}`,
+                payload: {
+                    source: "pickstation",
+                    document_type_code: "verzendbrief",
+                    trigger: "with_packing_slip",
+                    is_floriday: true,
+                    queue_item_id: slipPayload["queue_item_id"] ?? null,
+                    packing_slip_job_id: row.slip_job_id,
+                    print_batch_key: row.batch_key ?? `kar-print:${row.slip_job_id}`,
+                    print_plek_id: printPlekId,
+                    order_id: row.order_id,
+                    ordernummer: row.order_number,
+                    order_number: row.order_number,
+                    cart_id: cartId,
+                    cart: slipPayload["cart"] ?? null,
+                    barcode: slipPayload["barcode"] ?? null,
+                    fulfillment_order_id: fulfillmentOrderId,
+                },
+            });
+            if (!printed.ok) {
+                if (["GEEN_PRINTER", "GEEN_LAYOUT", "GEEN_EXTERN_DOCUMENT"].includes(printed.errorCode)) {
+                    await faal(printed.errorCode.toLowerCase(), printed.error, fulfillmentOrderId);
                 }
-                jobId = job?.["id"] ?? null;
+                else {
+                    await wacht(`De verzendbrief kon nog niet worden klaargezet: ${printed.error}`, "tijdelijk");
+                }
+                continue;
             }
+            const jobId = printed.jobId;
+            const printerId = printed.printerId;
             await sb.rpc("logistics_slip_note_finish", {
                 _id: row.id,
                 _ok: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/logistiek-engine",
-  "version": "1.0.94",
+  "version": "1.0.98",
   "flowselections": {
     "moduleId": "logistiek-engine",
     "pages": [