@flowselections/floriday-afhandeling-module 1.0.40 → 1.0.42

package/dist-lib/lib/cartControl.functions.js

@@ -7,7 +7,6 @@ function toIso(d) {
     const day = String(d.getDate()).padStart(2, "0");
     return `${y}-${m}-${day}`;
 }
-const APPROVED_STATUSES = new Set(["ready", "shipped", "delivered"]);
 async function loadControlPlanningSettings(supabase, userId) {
     const { data: settings } = await supabase
         .from("afhandeling_settings")
@@ -20,126 +19,101 @@ async function loadControlPlanningSettings(supabase, userId) {
     const minWorkdays = Math.max(0, Number(settings?.pick_days_before_transport ?? 1));
     return { pickWeekdays, minWorkdays };
 }
-/**
- * Karren van vandaag volgens de Logistics Engine.
- *
- * De Engine is leidend: alleen orders met een `load.compose`-taak waarvan
- * `planned_start` vandaag (Europe/Amsterdam) valt, staan op de controlelijst,
- * en het aantal karren komt uit `payload.loadCarriers` — nooit meer uit de
- * eigen stuks/fust-berekening.
- */
-function amsterdamDay(iso) {
-    if (!iso)
-        return null;
-    const d = new Date(iso);
-    if (Number.isNaN(d.getTime()))
-        return null;
-    return new Intl.DateTimeFormat("en-CA", {
-        timeZone: "Europe/Amsterdam",
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit",
-    }).format(d);
+export function controlCartKey(cart) {
+    return cart.cartNumberId ?? `${cart.orderSource}#${cart.orderId}#${cart.cartIndex}`;
 }
-async function loadEngineCartsForToday(supabase) {
-    const today = amsterdamDay(new Date().toISOString());
-    const { data, error } = await supabase
-        .from("logistics_tasks")
-        .select("order_ref, payload, planned_start, sequence, status")
-        .eq("owner_module", "afhandeling")
-        .eq("task_type", "load.compose")
-        .in("status", ["planned", "ready", "in_progress"])
-        .limit(1000);
+async function loadControlCarts(supabase) {
+    const { data, error } = await supabase.rpc("control_get_todays_carts");
     if (error)
         throw new Error(error.message);
-    const map = new Map();
-    for (const row of (data ?? [])) {
-        const day = amsterdamDay(row.planned_start);
-        if (!day || day !== today)
-            continue;
-        const carriers = Array.isArray(row.payload?.loadCarriers)
-            ? row.payload.loadCarriers
-            : [];
-        const cartCount = carriers.length;
-        const cartOrderRefs = carriers.map((c) => Array.isArray(c?.orderRefs) ? c.orderRefs.filter((r) => typeof r === "string") : []);
-        const existing = map.get(row.order_ref);
-        if (!existing || cartCount > existing.cartCount) {
-            map.set(row.order_ref, {
-                cartCount: Math.max(1, cartCount),
-                pickDate: day,
-                cartOrderRefs,
+    const rows = (data ?? []);
+    if (rows.length === 0)
+        return [];
+    // --- Verrijking 1: ordergegevens ---
+    const orderIds = Array.from(new Set(rows.map((r) => r.order_id).filter(Boolean)));
+    const orderMap = new Map();
+    if (orderIds.length > 0) {
+        const { data: orderRows } = await supabase
+            .from("orders")
+            .select("id, order_number, customer_name, delivery_date")
+            .in("id", orderIds);
+        for (const o of (orderRows ?? [])) {
+            orderMap.set(o.id, {
+                orderNumber: o.order_number ?? "",
+                customerName: o.customer_name ?? "",
+                deliveryDate: o.delivery_date ?? null,
             });
         }
     }
-    return map;
-}
-/** Alle nog niet goedgekeurde karren van vandaag, gefilterd op de Engine. */
-async function loadPendingControlOrders(supabase) {
-    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
-    const [orders, engine] = await Promise.all([
-        loadTodaysPickstationOrders(),
-        loadEngineCartsForToday(supabase),
-    ]);
-    const pending = orders.filter((o) => !APPROVED_STATUSES.has(o.status));
-    const result = [];
-    const seenSharedCarts = new Set();
-    for (const o of pending) {
-        const info = (o.orderNumber ? engine.get(o.orderNumber) : undefined) ?? engine.get(o.orderId);
-        const refs = info?.cartOrderRefs[o.cartIndex - 1] ?? [];
-        const orderNumbers = Array.from(new Set([o.orderNumber, ...refs].filter((v) => Boolean(v))));
-        if (orderNumbers.length > 1) {
-            // Kar met meerdere orders: maar één regel tonen.
-            const key = `${[...orderNumbers].sort().join("|")}#${o.cartIndex}`;
-            if (seenSharedCarts.has(key))
-                continue;
-            seenSharedCarts.add(key);
+    const extras = new Map();
+    try {
+        const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
+        const psOrders = await loadTodaysPickstationOrders();
+        for (const o of psOrders) {
+            extras.set(`${o.orderId}#${o.cartIndex - 1}`, {
+                cartNumber: o.cartNumber,
+                carrierName: o.carrierName,
+                pickupDate: o.pickupDate,
+                pickupTime: o.pickupTime,
+                country: o.country,
+                cratesOnCart: o.cratesOnCart,
+                printedCount: o.printedCount,
+                orderNumbers: o.orderNumber ? [o.orderNumber] : [],
+            });
         }
-        result.push({
-            orderId: o.orderId,
-            orderSource: o.orderSource,
-            cartIndex: o.cartIndex,
-            cartNumber: o.cartNumber,
-            orderNumber: o.orderNumber,
+    }
+    catch {
+        // Verrijking is optioneel: zonder deze gegevens blijft de kar zichtbaar.
+    }
+    const carts = [];
+    const seen = new Set();
+    for (const r of rows) {
+        const orderSource = (r.order_source ?? "manual");
+        const cartNumberId = r.cart_number_id ?? null;
+        const key = controlCartKey({
+            cartNumberId,
+            orderSource,
+            orderId: r.order_id,
+            cartIndex: r.cart_index,
+        });
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        const order = orderMap.get(r.order_id);
+        const extra = extras.get(`${r.order_id}#${r.cart_index}`) ??
+            extras.get(`${r.order_id}#${r.cart_index - 1}`);
+        const orderNumber = order?.orderNumber ?? "";
+        const orderNumbers = Array.from(new Set([orderNumber, ...(extra?.orderNumbers ?? [])].filter(Boolean)));
+        carts.push({
+            cartNumberId,
+            cartNumber: r.cart_number ?? extra?.cartNumber ?? null,
+            orderId: r.order_id,
+            orderSource,
+            cartIndex: r.cart_index,
+            orderNumber,
             orderNumbers,
-            customerName: o.customerName,
-            carrierName: o.carrierName,
-            deliveryDate: o.deliveryDate,
-            pickupDate: o.pickupDate,
-            pickupTime: o.pickupTime,
-            country: o.country,
-            cratesOnCart: o.cratesOnCart,
-            pickDate: info?.pickDate ?? amsterdamDay(new Date().toISOString()),
-            printedCount: o.printedCount,
-            status: o.status,
+            customerName: order?.customerName ?? "",
+            carrierName: extra?.carrierName ?? null,
+            deliveryDate: order?.deliveryDate ?? null,
+            pickupDate: extra?.pickupDate ?? null,
+            pickupTime: extra?.pickupTime ?? null,
+            country: extra?.country ?? null,
+            cratesOnCart: extra?.cratesOnCart ?? null,
+            pickDate: r.pick_date,
+            printedCount: r.printed_today ? Math.max(1, extra?.printedCount ?? 1) : 0,
+            printedToday: Boolean(r.printed_today),
+            printedAt: r.printed_at ?? null,
+            status: r.status ?? "pending",
         });
     }
-    return result;
+    return carts;
 }
-/** Haal alle karren op die vandaag gepickt / klaargezet hadden moeten worden. */
+/** Haal alle karren op die vandaag gecontroleerd moeten worden (RPC is leidend). */
 export const getTodaysControlCarts = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
     .handler(async ({ context }) => {
     const supabase = context.supabase;
-    const orders = await loadPendingControlOrders(supabase);
-    const carts = orders.map((o) => ({
-        cartNumberId: null, // will be resolved below via cart_numbers lookup
-        cartNumber: o.cartNumber,
-        orderId: o.orderId,
-        orderSource: o.orderSource,
-        cartIndex: o.cartIndex - 1, // pickstation uses 1-based, DB is 0-based
-        orderNumber: o.orderNumber,
-        orderNumbers: o.orderNumbers,
-        customerName: o.customerName,
-        carrierName: o.carrierName,
-        deliveryDate: o.deliveryDate,
-        pickupDate: o.pickupDate,
-        pickupTime: o.pickupTime,
-        country: o.country,
-        cratesOnCart: o.cratesOnCart,
-        pickDate: o.pickDate,
-        printedCount: o.printedCount,
-        status: o.status,
-    }));
+    const carts = await loadControlCarts(supabase);
     return { carts };
 });
 export const getControlRescheduleProposals = createServerFn({ method: "POST" })
@@ -147,13 +121,13 @@ export const getControlRescheduleProposals = createServerFn({ method: "POST" })
     .inputValidator((d) => d)
     .handler(async ({ data, context }) => {
     const supabase = context.supabase;
-    const pendingOrders = await loadPendingControlOrders(supabase);
+    const pendingOrders = await loadControlCarts(supabase);
     const { pickWeekdays, minWorkdays } = await loadControlPlanningSettings(supabase, context.userId);
     const checkedSet = new Set(data.checkedCartKeys);
     const proposals = [];
     const blocked = [];
     for (const o of pendingOrders) {
-        const key = `${o.orderSource}#${o.orderId}#${o.cartIndex - 1}`;
+        const key = controlCartKey(o);
         if (checkedSet.has(key))
             continue;
         const currentIso = o.pickDate || toIso(new Date());
@@ -181,11 +155,11 @@ export const getControlRescheduleProposals = createServerFn({ method: "POST" })
         }
         else {
             blocked.push({
-                cartNumberId: null,
+                cartNumberId: o.cartNumberId,
                 cartNumber: o.cartNumber,
                 orderId: o.orderId,
                 orderSource: o.orderSource,
-                cartIndex: o.cartIndex - 1,
+                cartIndex: o.cartIndex,
                 orderNumber: o.orderNumber,
                 customerName: o.customerName,
                 carrierName: o.carrierName,
@@ -202,8 +176,8 @@ export const submitControlSession = createServerFn({ method: "POST" })
     .inputValidator((d) => d)
     .handler(async ({ data, context }) => {
     const supabase = context.supabase;
-    // 1) Laad alle karren van vandaag (Engine is leidend) + instellingen
-    const pendingOrders = await loadPendingControlOrders(supabase);
+    // 1) Laad exact dezelfde karren als het scherm toont (RPC is leidend)
+    const pendingOrders = await loadControlCarts(supabase);
     const { pickWeekdays, minWorkdays } = await loadControlPlanningSettings(supabase, context.userId);
     // 2) Maak sessie aan
     const { data: session, error: sessErr } = await supabase
@@ -224,25 +198,16 @@ export const submitControlSession = createServerFn({ method: "POST" })
     const rescheduled = [];
     const blocked = [];
     let checkedCount = 0;
-    // Lookup cart_numbers row ids
-    const { data: cnRows } = await supabase
-        .from("cart_numbers")
-        .select("id, order_source, order_id, cart_index")
-        .in("order_id", Array.from(new Set(pendingOrders.map((o) => o.orderId))));
-    const cnMap = new Map();
-    for (const r of (cnRows ?? [])) {
-        cnMap.set(`${r.order_source}#${r.order_id}#${r.cart_index}`, r.id);
-    }
     for (const o of pendingOrders) {
-        const key = `${o.orderSource}#${o.orderId}#${o.cartIndex - 1}`;
-        const cartNumberId = cnMap.get(key) ?? null;
+        const key = controlCartKey(o);
+        const cartNumberId = o.cartNumberId;
         const baseFields = {
             session_id: session.id,
             cart_number_id: cartNumberId,
             cart_number_label: o.cartNumber,
             order_id: o.orderId,
             order_source: o.orderSource,
-            cart_index: o.cartIndex - 1,
+            cart_index: o.cartIndex,
             order_number: o.orderNumber,
             customer_name: o.customerName,
             carrier_name: o.carrierName,
@@ -254,7 +219,7 @@ export const submitControlSession = createServerFn({ method: "POST" })
             await supabase.rpc("pickstation_set_cart_status", {
                 p_order_source: o.orderSource,
                 p_order_id: o.orderId,
-                p_cart_index: o.cartIndex - 1,
+                p_cart_index: o.cartIndex,
                 p_status: "ready",
             });
             items.push({ ...baseFields, action: "checked" });
@@ -278,7 +243,7 @@ export const submitControlSession = createServerFn({ method: "POST" })
                 .upsert({
                 order_id: o.orderId,
                 order_source: o.orderSource,
-                cart_index: o.cartIndex - 1,
+                cart_index: o.cartIndex,
                 pick_date: newIso,
                 moved_from_date: toIso(new Date()),
             }, { onConflict: "order_id,order_source,cart_index" });
@@ -309,7 +274,7 @@ export const submitControlSession = createServerFn({ method: "POST" })
                 cartNumber: o.cartNumber,
                 orderId: o.orderId,
                 orderSource: o.orderSource,
-                cartIndex: o.cartIndex - 1,
+                cartIndex: o.cartIndex,
                 orderNumber: o.orderNumber,
                 customerName: o.customerName,
                 carrierName: o.carrierName,