@flowselections/floriday-afhandeling-module 1.0.25 → 1.0.26

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

@@ -20,21 +20,115 @@ 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);
+}
+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);
+    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,
+            });
+        }
+    }
+    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);
+        }
+        result.push({
+            orderId: o.orderId,
+            orderSource: o.orderSource,
+            cartIndex: o.cartIndex,
+            cartNumber: o.cartNumber,
+            orderNumber: o.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,
+        });
+    }
+    return result;
+}
 /** Haal alle karren op die vandaag gepickt / klaargezet hadden moeten worden. */
 export const getTodaysControlCarts = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
-    .handler(async () => {
-    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
-    const orders = await loadTodaysPickstationOrders();
-    const carts = orders
-        .filter((o) => !APPROVED_STATUSES.has(o.status))
-        .map((o) => ({
+    .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,
@@ -53,9 +147,7 @@ export const getControlRescheduleProposals = createServerFn({ method: "POST" })
     .inputValidator((d) => d)
     .handler(async ({ data, context }) => {
     const supabase = context.supabase;
-    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
-    const orders = await loadTodaysPickstationOrders();
-    const pendingOrders = orders.filter((o) => !APPROVED_STATUSES.has(o.status));
+    const pendingOrders = await loadPendingControlOrders(supabase);
     const { pickWeekdays, minWorkdays } = await loadControlPlanningSettings(supabase, context.userId);
     const checkedSet = new Set(data.checkedCartKeys);
     const proposals = [];
@@ -110,10 +202,8 @@ export const submitControlSession = createServerFn({ method: "POST" })
     .inputValidator((d) => d)
     .handler(async ({ data, context }) => {
     const supabase = context.supabase;
-    // 1) Laad alle karren van vandaag + instellingen
-    const { loadTodaysPickstationOrders } = await import("./pickstationOrders.server");
-    const orders = await loadTodaysPickstationOrders();
-    const pendingOrders = orders.filter((o) => !APPROVED_STATUSES.has(o.status));
+    // 1) Laad alle karren van vandaag (Engine is leidend) + instellingen
+    const pendingOrders = await loadPendingControlOrders(supabase);
     const { pickWeekdays, minWorkdays } = await loadControlPlanningSettings(supabase, context.userId);
     // 2) Maak sessie aan
     const { data: session, error: sessErr } = await supabase