@flowselections/logistiek-engine 1.0.100 → 1.0.106

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

@@ -1 +1 @@
-{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAiBD,qFAAqF;AACrF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAC5C,mDAAmD;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAgBzC,mDAAmD;AACnD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC1F,GAAG,GAAE,MAAmB,GACvB,UAAU,GAAG,MAAM,GAAG,IAAI,CAK5B;AA6BD,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAiMzB"}
+{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAiBD,qFAAqF;AACrF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAC5C,mDAAmD;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAgBzC,mDAAmD;AACnD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC1F,GAAG,GAAE,MAAmB,GACvB,UAAU,GAAG,MAAM,GAAG,IAAI,CAK5B;AA6BD,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAsOzB"}

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

@@ -157,6 +157,43 @@ export async function runControlScanQueue(sb, options = {}) {
                     run.waiting++;
                 continue;
             }
+            // Eerst de status bij Floriday: pas bij ACCEPTED/DELIVERED bestaat het document.
+            const { getFlorydayFulfillmentStatus } = await import("./floridayDocuments.server.js");
+            const besluit = await getFlorydayFulfillmentStatus(sb, fulfillmentOrderId);
+            if (besluit.kind === "afgewezen" || besluit.kind === "geannuleerd") {
+                const reden = besluit.kind === "afgewezen"
+                    ? `Floriday heeft de afleverbrief afgewezen: ${besluit.reden}`
+                    : "Floriday heeft deze order geannuleerd (fulfillment-order).";
+                await sb.rpc("logistics_control_scan_finish", {
+                    _id: row.id,
+                    _ok: false,
+                    _status: "mislukt",
+                    _fulfillment_order_id: fulfillmentOrderId,
+                    _error_code: besluit.kind === "afgewezen" ? "floriday_afgewezen" : "floriday_geannuleerd",
+                    _error: reden,
+                });
+                await trace(sb, {
+                    orderRef: row.order_number,
+                    orderSource: "floriday",
+                    cartRef: row.cart_id,
+                    phase: "controle",
+                    step: "Afleverbrief gestopt: Floriday-status " + besluit.status,
+                    status: "mislukt",
+                    actor: "engine:controlepost",
+                    errorClass: "extern",
+                    reason: reden,
+                    error: reden,
+                });
+                run.failed++;
+                continue;
+            }
+            if (besluit.kind === "wachten") {
+                if (await keepWaiting(sb, row))
+                    run.failed++;
+                else
+                    run.waiting++;
+                continue;
+            }
             const doc = (await getFlorydayDocument(sb, {
                 kind: "delivery-note",
                 fulfillmentOrderId,

package/dist-lib/lib/floridayCartCarriers.d.ts

@@ -0,0 +1,61 @@
+export interface CartInput {
+    cartNumber: number | null;
+    layersUsed: number | null;
+    barcode?: string | null;
+    items: Array<{
+        fulfillmentRequestId: string | null;
+        crates: number | null;
+    }>;
+}
+export interface DeliveryRequestInput {
+    fulfillmentRequestId: string;
+    numberOfPackages: number | null;
+    serviceCode?: number | null;
+    packingAgentOrganizationId?: string | null;
+    deliveryRemarks?: string | null;
+    commercialInvoiceReference?: string | null;
+    alternativeDisplayName?: string | null;
+}
+export interface LoadCarrierItem {
+    fulfillmentRequestId: string;
+    numberOfPackages: number;
+    serviceCode?: number;
+    packingAgentOrganizationId?: string;
+    deliveryRemarks?: string;
+    commercialInvoiceReference?: string;
+    alternativeDisplayName?: string;
+}
+export interface LoadCarrier {
+    numberOfAdditionalLayers: number;
+    sortIndex: number;
+    loadCarrierReference: string;
+    loadCarrierBarcode?: string;
+    items: LoadCarrierItem[];
+}
+export type CartCarriersResult = {
+    ok: true;
+    loadCarriers: LoadCarrier[];
+} | {
+    ok: false;
+    code: string;
+    error: string;
+};
+export declare function buildCartCarriers(carts: CartInput[], requests: DeliveryRequestInput[]): CartCarriersResult;
+export type FulfillmentDecision = {
+    kind: "klaar";
+    status: string;
+} | {
+    kind: "afgewezen";
+    status: string;
+    reden: string;
+} | {
+    kind: "geannuleerd";
+    status: string;
+} | {
+    kind: "wachten";
+    status: string | null;
+    reden: string;
+    tijdelijk: boolean;
+};
+export declare function decideFulfillmentStatus(result: unknown): FulfillmentDecision;
+//# sourceMappingURL=floridayCartCarriers.d.ts.map

package/dist-lib/lib/floridayCartCarriers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floridayCartCarriers.d.ts","sourceRoot":"","sources":["../../src/lib/floridayCartCarriers.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;QAAE,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAC9E;AAED,MAAM,WAAW,oBAAoB;IACnC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,0BAA0B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,0BAA0B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,WAAW;IAC1B,wBAAwB,EAAE,MAAM,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAED,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,YAAY,EAAE,WAAW,EAAE,CAAA;CAAE,GACzC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,EAAE,EAClB,QAAQ,EAAE,oBAAoB,EAAE,GAC/B,kBAAkB,CAuEpB;AAMD,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AAElF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,GAAG,mBAAmB,CA0B5E"}

package/dist-lib/lib/floridayCartCarriers.js

@@ -0,0 +1,113 @@
+// ============================================================================
+// src/lib/floridayCartCarriers.ts — eigen karindeling → `loadCarriers` voor de
+// fulfillment-order (veld dat de Floriday-koppelmodule als karindeling leest).
+// ============================================================================
+// Puur en testbaar. Fail-closed: kan een karregel niet aan een
+// fulfillmentRequest worden gekoppeld, of klopt het aantal fusten per request
+// niet met de delivery-order, dan wordt er niets opgebouwd en komt er een
+// duidelijke reden terug. Er wordt nooit stil teruggevallen op 0 lagen.
+// ============================================================================
+export function buildCartCarriers(carts, requests) {
+    if (carts.length === 0) {
+        return { ok: false, code: "geen_karindeling", error: "Er is nog geen karindeling voor deze order." };
+    }
+    const byId = new Map(requests.map((r) => [r.fulfillmentRequestId, r]));
+    const totals = new Map();
+    const out = [];
+    for (const [index, cart] of carts.entries()) {
+        const label = cart.cartNumber ?? index + 1;
+        const layers = cart.layersUsed;
+        if (typeof layers !== "number" || !Number.isFinite(layers) || layers < 0) {
+            return {
+                ok: false,
+                code: "lagen_onbekend",
+                error: `Kar ${label} heeft geen geldig aantal lagen; de belading wordt niet verstuurd.`,
+            };
+        }
+        const perRequest = new Map();
+        for (const item of cart.items) {
+            const id = String(item.fulfillmentRequestId ?? "").trim();
+            if (!id || !byId.has(id)) {
+                return {
+                    ok: false,
+                    code: "geen_fulfillment_request",
+                    error: `Een regel op kar ${label} hoort bij geen enkel Floriday-verzoek op de delivery-order.`,
+                };
+            }
+            const crates = Number(item.crates ?? 0);
+            perRequest.set(id, (perRequest.get(id) ?? 0) + (Number.isFinite(crates) ? crates : 0));
+        }
+        const items = [];
+        for (const [id, packages] of perRequest) {
+            if (packages <= 0)
+                continue;
+            totals.set(id, (totals.get(id) ?? 0) + packages);
+            const req = byId.get(id);
+            const item = { fulfillmentRequestId: id, numberOfPackages: packages };
+            if (typeof req.serviceCode === "number")
+                item.serviceCode = req.serviceCode;
+            if (req.packingAgentOrganizationId)
+                item.packingAgentOrganizationId = req.packingAgentOrganizationId;
+            if (req.deliveryRemarks)
+                item.deliveryRemarks = req.deliveryRemarks;
+            if (req.commercialInvoiceReference)
+                item.commercialInvoiceReference = req.commercialInvoiceReference;
+            if (req.alternativeDisplayName)
+                item.alternativeDisplayName = req.alternativeDisplayName;
+            items.push(item);
+        }
+        if (items.length === 0) {
+            return { ok: false, code: "lege_kar", error: `Kar ${label} bevat geen fusten.` };
+        }
+        const carrier = {
+            numberOfAdditionalLayers: layers,
+            sortIndex: index + 1,
+            loadCarrierReference: String(label),
+            items,
+        };
+        if (cart.barcode)
+            carrier.loadCarrierBarcode = cart.barcode;
+        out.push(carrier);
+    }
+    for (const req of requests) {
+        const expected = Number(req.numberOfPackages ?? 0);
+        const got = totals.get(req.fulfillmentRequestId) ?? 0;
+        if (got !== expected) {
+            return {
+                ok: false,
+                code: "fusten_wijken_af",
+                error: `De karindeling heeft ${got} fust(en) voor Floriday-verzoek ${req.fulfillmentRequestId}, ` +
+                    `maar de Floriday-order vraagt ${expected}. De belading wordt niet verstuurd.`,
+            };
+        }
+    }
+    return { ok: true, loadCarriers: out };
+}
+export function decideFulfillmentStatus(result) {
+    const r = (result ?? {});
+    const payload = ((r["payload"] ?? r) ?? {});
+    if (payload["ok"] !== true) {
+        return {
+            kind: "wachten",
+            status: null,
+            tijdelijk: true,
+            reden: `Status bij Floriday niet leesbaar: ${String(payload["error"] ?? "onbekende fout")}`,
+        };
+    }
+    const status = String(payload["fulfillmentStatus"] ?? "").toUpperCase();
+    if (status === "ACCEPTED" || status === "DELIVERED")
+        return { kind: "klaar", status };
+    if (status === "FAILED") {
+        const se = payload["submissionError"];
+        const reden = typeof se === "string" ? se : se ? JSON.stringify(se) : "Floriday heeft de fulfillment-order afgewezen (geen reden meegegeven).";
+        return { kind: "afgewezen", status, reden };
+    }
+    if (status === "CANCELLED")
+        return { kind: "geannuleerd", status };
+    return {
+        kind: "wachten",
+        status: status || null,
+        tijdelijk: false,
+        reden: `Floriday verwerkt de fulfillment-order nog (status ${status || "onbekend"}).`,
+    };
+}

package/dist-lib/lib/floridayCartCarriers.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=floridayCartCarriers.test.d.ts.map

package/dist-lib/lib/floridayCartCarriers.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floridayCartCarriers.test.d.ts","sourceRoot":"","sources":["../../src/lib/floridayCartCarriers.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/floridayCartCarriers.test.js

@@ -0,0 +1,66 @@
+import { describe, expect, it } from "vitest";
+import { buildCartCarriers, decideFulfillmentStatus } from "./floridayCartCarriers";
+const reqs = [
+    { fulfillmentRequestId: "fr-a", numberOfPackages: 50, deliveryRemarks: "achterdeur" },
+    { fulfillmentRequestId: "fr-b", numberOfPackages: 10 },
+];
+describe("buildCartCarriers", () => {
+    it("geeft per kar de echte lagen en de fusten per verzoek mee", () => {
+        const r = buildCartCarriers([
+            { cartNumber: 1, layersUsed: 4, items: [{ fulfillmentRequestId: "fr-a", crates: 30 }] },
+            {
+                cartNumber: 2,
+                layersUsed: 3,
+                items: [
+                    { fulfillmentRequestId: "fr-a", crates: 15 },
+                    { fulfillmentRequestId: "fr-a", crates: 5 },
+                    { fulfillmentRequestId: "fr-b", crates: 10 },
+                ],
+            },
+        ], reqs);
+        expect(r.ok).toBe(true);
+        if (!r.ok)
+            return;
+        expect(r.loadCarriers.map((c) => c.numberOfAdditionalLayers)).toEqual([4, 3]);
+        expect(r.loadCarriers[1].items).toEqual([
+            { fulfillmentRequestId: "fr-a", numberOfPackages: 20, deliveryRemarks: "achterdeur" },
+            { fulfillmentRequestId: "fr-b", numberOfPackages: 10 },
+        ]);
+    });
+    it("verstuurt niet als een karregel bij geen verzoek hoort", () => {
+        const r = buildCartCarriers([{ cartNumber: 1, layersUsed: 2, items: [{ fulfillmentRequestId: null, crates: 60 }] }], reqs);
+        expect(r).toMatchObject({ ok: false, code: "geen_fulfillment_request" });
+    });
+    it("verstuurt niet als het aantal fusten afwijkt van Floriday", () => {
+        const r = buildCartCarriers([{ cartNumber: 1, layersUsed: 2, items: [{ fulfillmentRequestId: "fr-a", crates: 49 }, { fulfillmentRequestId: "fr-b", crates: 10 }] }], reqs);
+        expect(r).toMatchObject({ ok: false, code: "fusten_wijken_af" });
+    });
+    it("valt nooit terug op 0 lagen", () => {
+        const r = buildCartCarriers([{ cartNumber: 1, layersUsed: null, items: [{ fulfillmentRequestId: "fr-a", crates: 50 }] }], reqs);
+        expect(r).toMatchObject({ ok: false, code: "lagen_onbekend" });
+    });
+});
+describe("decideFulfillmentStatus", () => {
+    const p = (payload) => ({ status: 200, payload: { ok: true, ...payload } });
+    it("FAILED → afgewezen met de letterlijke submissionError", () => {
+        expect(decideFulfillmentStatus(p({ fulfillmentStatus: "FAILED", submissionError: "Invalid load carrier" }))).toEqual({
+            kind: "afgewezen",
+            status: "FAILED",
+            reden: "Invalid load carrier",
+        });
+    });
+    it("ACCEPTED en DELIVERED → klaar om te printen", () => {
+        expect(decideFulfillmentStatus(p({ fulfillmentStatus: "ACCEPTED" })).kind).toBe("klaar");
+        expect(decideFulfillmentStatus(p({ fulfillmentStatus: "DELIVERED" })).kind).toBe("klaar");
+    });
+    it("PENDING/DRAFT → wachten", () => {
+        expect(decideFulfillmentStatus(p({ fulfillmentStatus: "PENDING" })).kind).toBe("wachten");
+        expect(decideFulfillmentStatus(p({ fulfillmentStatus: "DRAFT" })).kind).toBe("wachten");
+    });
+    it("onleesbaar → wachten, tijdelijk", () => {
+        expect(decideFulfillmentStatus({ status: 502, payload: { ok: false, error: "x" } })).toMatchObject({
+            kind: "wachten",
+            tijdelijk: true,
+        });
+    });
+});