@flowselections/logistiek-engine 1.0.33 → 1.0.53

package/dist-lib/lib/cartPlanRequests.server.d.ts

@@ -6,7 +6,7 @@ export interface CartPlanRequestResult {
     failed: number;
     errors: string[];
 }
-/** Verwerkt openstaande 'cartplan.missing'-seintjes. Idempotent. */
+/** Verwerkt openstaande 'cartplan.missing'- en 'pick.data_incomplete'-seintjes. */
 export declare function runCartPlanRequests(sb: SupabaseClient, options?: {
     limit?: number;
 }): Promise<CartPlanRequestResult>;

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

@@ -1 +1 @@
-{"version":3,"file":"cartPlanRequests.server.d.ts","sourceRoot":"","sources":["../../src/lib/cartPlanRequests.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAoGD,oEAAoE;AACpE,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CAmGhC"}
+{"version":3,"file":"cartPlanRequests.server.d.ts","sourceRoot":"","sources":["../../src/lib/cartPlanRequests.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AA0HD,mFAAmF;AACnF,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CA6HhC"}

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

@@ -12,6 +12,9 @@
 // ============================================================================
 import { replanOrderInternal } from "./loadCarrierPlanning.server.js";
 const EVENT_TYPE = "cartplan.missing";
+/** Tweede seintje: het pickscherm klikte op "Pakbon ophalen". */
+const DATA_EVENT_TYPE = "order.changed";
+const DATA_REASON = "pick.data_incomplete";
 /** Leest het karplan van één order; leeg betekent: geen plan. */
 async function slipPlanCartCount(sb, orderId) {
     const { data, error } = await sb.rpc("logistics_cart_slip_plan", { p_order_id: orderId });
@@ -90,25 +93,50 @@ async function finish(sb, row, status, extra, errorText) {
     })
         .eq("id", row.id);
 }
-/** Verwerkt openstaande 'cartplan.missing'-seintjes. Idempotent. */
+/**
+ * Barcodes borgen, pick_queue.payload bijwerken en de actuele status ophalen.
+ * Idempotent: bestaande kar-id's, nummers en barcodes blijven ongewijzigd.
+ */
+async function ensurePickData(sb, row) {
+    const missing = Array.isArray(row.payload?.["missing"]) ? row.payload["missing"] : [];
+    const { data, error } = await sb.rpc("logistics_ensure_pick_data", {
+        p_ref: row.order_ref ?? "",
+        p_missing: missing,
+        p_event_id: row.id,
+    });
+    if (error)
+        return { ready: false, released: false, reason: error.message };
+    const status = (Array.isArray(data) ? data[0] : data);
+    return status ?? null;
+}
+/** Verwerkt openstaande 'cartplan.missing'- en 'pick.data_incomplete'-seintjes. */
 export async function runCartPlanRequests(sb, options = {}) {
     const result = { claimed: 0, resolved: 0, planned: 0, failed: 0, errors: [] };
-    const { data, error } = await sb
+    const limit = options.limit ?? 20;
+    const baseQuery = (eventType) => sb
         .from("logistics_events")
         .select("id, order_ref, payload")
-        .eq("event_type", EVENT_TYPE)
+        .eq("event_type", eventType)
         // Een bestaande databasetrigger kan het seintje al op 'processed' zetten.
         // Afgehandeld is het pas als de Engine er zelf een resultaat bij schrijft.
         .not("status", "in", "(resolved,failed)")
         .is("payload->result", null)
         .order("created_at", { ascending: true })
-        .limit(options.limit ?? 20);
+        .limit(limit);
+    const [missingRes, dataRes] = await Promise.all([
+        baseQuery(EVENT_TYPE),
+        baseQuery(DATA_EVENT_TYPE).eq("payload->>reason", DATA_REASON),
+    ]);
+    const error = missingRes.error ?? dataRes.error;
     if (error) {
         result.failed++;
         result.errors.push(error.message);
         return result;
     }
-    const rows = Array.isArray(data) ? data : [];
+    const rows = [
+        ...(Array.isArray(missingRes.data) ? missingRes.data : []),
+        ...(Array.isArray(dataRes.data) ? dataRes.data : []),
+    ];
     result.claimed = rows.length;
     for (const row of rows) {
         try {
@@ -147,14 +175,27 @@ export async function runCartPlanRequests(sb, options = {}) {
                     : "Karplan onvolledig: de orders van deze buffer staan niet op dezelfde karren.");
                 continue;
             }
-            result.resolved++;
-            await finish(sb, row, "resolved", {
+            // Barcodes borgen, pick_queue bijwerken en de actuele status ophalen.
+            const status = await ensurePickData(sb, row);
+            const ready = status?.["ready"] === true;
+            const released = status?.["released"] === true;
+            const reason = status?.["reason"] ?? null;
+            const base = {
                 orderId,
                 bufferOrderIds: members,
                 carts: plans[0]?.carts ?? 0,
                 cartIds: plans[0]?.cartIds ?? [],
                 totalCarts: plans[0]?.totalCarts ?? plans[0]?.carts ?? 0,
-            }, null);
+                status,
+            };
+            if (ready && released) {
+                result.resolved++;
+                await finish(sb, row, "resolved", base, null);
+            }
+            else {
+                result.failed++;
+                await finish(sb, row, "failed", base, reason ?? "De pakbongegevens konden niet worden gemaakt.");
+            }
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);