@flowselections/floriday-afhandeling-module 1.0.25 → 1.0.26

package/dist-lib/hooks/useOrderPlanning.js

@@ -1,32 +1,21 @@
-import { useMemo } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { useServerFn } from "@tanstack/react-start";
 import { getFloridayOrders } from "../lib/floriday.functions";
 import { getAfhandelingSettings } from "../lib/afhandelingSettings.functions";
 import { listCarriers } from "../lib/carriers.functions";
-import { listCartOverrides } from "../lib/cartAssignments.functions";
+import { safeServerCall } from "../lib/serverFnError";
 import { normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget } from "../lib/carrierPlanning";
-import { getActiveWizardConfig } from "../lib/logisticsEngine/wizard.functions";
-import { computeEnginePickStart } from "../lib/logisticsEngine/enginePickTime";
-import { calculateOrderPlanning, distributePickDates, getSignupDeadline, DEFAULT_PICKUP_MOMENT, } from "../lib/planning";
+import { calculateOrderPlanning, DEFAULT_PICKUP_MOMENT, } from "../lib/planning";
+import { useEngineTasks } from "./useEngineTasks";
+import { emitEngineEvent } from "../lib/logisticsEngine/engine";
+function orderRefsFor(order) {
+    return [order.orderNumber, order.id].filter((v) => Boolean(v));
+}
 export function useOrderPlanning() {
     const fetchOrders = useServerFn(getFloridayOrders);
     const fetchSettings = useServerFn(getAfhandelingSettings);
     const fetchCarriers = useServerFn(listCarriers);
-    const fetchOverrides = useServerFn(listCartOverrides);
-    const fetchEngineConfig = useServerFn(getActiveWizardConfig);
-    const engineConfigQuery = useQuery({
-        queryKey: ["logistics", "active-wizard-config"],
-        queryFn: async () => {
-            try {
-                return await fetchEngineConfig();
-            }
-            catch {
-                return { config: null, strategyId: null };
-            }
-        },
-        retry: false,
-    });
     const ordersQuery = useQuery({
         queryKey: ["floriday", "orders"],
         queryFn: async () => {
@@ -60,6 +49,9 @@ export function useOrderPlanning() {
             }
         },
         retry: false,
+        refetchInterval: 60000,
+        refetchIntervalInBackground: false,
+        refetchOnWindowFocus: true,
     });
     const settingsQuery = useQuery({
         queryKey: ["afhandeling", "settings"],
@@ -71,52 +63,43 @@ export function useOrderPlanning() {
                 return { pickDaysBeforeTransport: 1, transportRegisterDaysBefore: 1, pickDistributionEnabled: false, maxWorkdaysEarlierPick: 2, signupMailEnabled: false, signupMailLeadMinutes: 60, signupMailPurpose: "afhandeling_carrier_signup", pickWeekdays: [1, 2, 3, 4, 5], extraPickDaysWithStickers: 0 };
             }
         },
+        refetchInterval: 60000,
+        refetchIntervalInBackground: false,
+        refetchOnWindowFocus: true,
     });
     const carriersQuery = useQuery({
         queryKey: ["carriers"],
-        queryFn: async () => {
-            try {
-                return await fetchCarriers();
-            }
-            catch {
-                return { carriers: [] };
-            }
-        },
+        queryFn: () => safeServerCall(() => fetchCarriers(), { carriers: [] }, "listCarriers"),
         retry: false,
+        refetchInterval: 60000,
+        refetchIntervalInBackground: false,
+        refetchOnWindowFocus: true,
     });
-    const overridesQuery = useQuery({
-        queryKey: ["cart-overrides"],
-        queryFn: async () => {
-            try {
-                return await fetchOverrides();
-            }
-            catch {
-                return { overrides: [] };
-            }
-        },
-        retry: false,
+    const { tasks: engineTasks, isLoading: tasksLoading, refetch: refetchTasks } = useEngineTasks({
+        taskTypes: ["load.compose", "pick.execute"],
     });
+    const { composeByRef, pickByRef } = useMemo(() => {
+        const compose = new Map();
+        const pick = new Map();
+        for (const t of engineTasks) {
+            const map = t.task_type === "pick.execute" ? pick : compose;
+            const existing = map.get(t.order_ref);
+            if (!existing || t.sequence < existing.sequence)
+                map.set(t.order_ref, t);
+        }
+        return { composeByRef: compose, pickByRef: pick };
+    }, [engineTasks]);
     const planned = useMemo(() => {
         const orders = ordersQuery.data?.orders ?? [];
         const settings = settingsQuery.data ?? {
             pickDaysBeforeTransport: 1,
             transportRegisterDaysBefore: 1,
-            pickDistributionEnabled: false,
-            maxWorkdaysEarlierPick: 2,
             pickWeekdays: [1, 2, 3, 4, 5],
             extraPickDaysWithStickers: 0,
         };
         const carriers = carriersQuery.data?.carriers ?? [];
-        const overrides = overridesQuery.data?.overrides ?? [];
         const pickWeekdays = settings.pickWeekdays ?? [1, 2, 3, 4, 5];
-        const overrideMap = new Map();
-        for (const o of overrides) {
-            overrideMap.set(`${o.order_source}#${o.order_id}#${o.cart_index}`, {
-                date: new Date(o.pick_date),
-                movedFromDate: o.moved_from_date ? new Date(o.moved_from_date) : null,
-            });
-        }
-        const initial = orders.map((order) => {
+        return orders.map((order) => {
             const carrier = selectCarrierForTarget(carriers, {
                 carrierId: order.carrierId,
                 country: order.country,
@@ -126,68 +109,87 @@ export function useOrderPlanning() {
             const moments = carrier
                 ? normalizePickupMoments(carrier.pickup_moments)
                 : [DEFAULT_PICKUP_MOMENT];
-            const carrierPickupWeekdays = sanitizeWeekdays(carrier?.pickup_weekdays);
-            const carrierDeliveryWeekdays = sanitizeWeekdays(carrier?.delivery_weekdays);
-            const extraStickerDays = Math.max(0, Math.floor(settings.extraPickDaysWithStickers ?? 0));
-            const pickDuration = settings.pickDaysBeforeTransport + (order.hasStickers ? extraStickerDays : 0);
-            const planning = calculateOrderPlanning(order.deliveryDate, {
+            // Transport-/leverdata blijven uit de vervoerdersagenda komen; het
+            // pickmoment en de karindeling komen uitsluitend uit de Engine-taak.
+            const base = calculateOrderPlanning(order.deliveryDate, {
                 pickupMoments: moments,
-                pickDurationWorkdays: pickDuration,
+                pickDurationWorkdays: settings.pickDaysBeforeTransport,
                 orderCreatedAt: order.createdAt,
                 pickWeekdays,
-                carrierPickupWeekdays,
-                carrierDeliveryWeekdays,
+                carrierPickupWeekdays: sanitizeWeekdays(carrier?.pickup_weekdays),
+                carrierDeliveryWeekdays: sanitizeWeekdays(carrier?.delivery_weekdays),
                 carrierId: carrier?.id ?? null,
                 carrierName: carrier?.name ?? null,
                 orderId: order.id,
             });
-            if (planning && carrier) {
-                planning.carrierName = carrier.name;
+            const refs = orderRefsFor(order);
+            const task = refs.map((ref) => composeByRef.get(ref)).find(Boolean) ?? null;
+            // De pickdag komt uit pick.execute (zelfde bron als de capaciteitscontrole
+            // van de Engine); load.compose blijft de bron voor de karindeling.
+            const pickTask = refs.map((ref) => pickByRef.get(ref)).find(Boolean) ?? null;
+            if (!task || !base) {
+                return { order, planning: null, engineTask: task, awaitingEngine: true };
             }
-            // Engine-gestuurd pickmoment ("Zo laat mogelijk"): overschrijf pickStartDate
-            // met het exacte datum/tijd-stip dat de logistieke engine berekent, zodat
-            // karren op de juiste plek in de agenda verschijnen.
-            const engineConfig = engineConfigQuery.data?.config ?? null;
-            if (planning && engineConfig && engineConfig.pickPlanningRelease.mode === "latest") {
-                const signupDeadline = getSignupDeadline(planning.deliveryDate, planning.selectedMoment);
-                const engine = computeEnginePickStart({
-                    signupDeadline,
-                    cartCount: order.cartCount ?? 1,
-                    config: engineConfig,
-                });
-                if (engine) {
-                    planning.pickStartDate = engine.pickStart;
-                    planning.scheduledPickDate = engine.pickStart;
-                    planning.pickAssignments = [{ date: engine.pickStart, cartCount: 0 }];
-                    planning.reason = `${planning.reason ?? ""} Engine: pick ${Math.round(engine.pickMinutes)}min + buffer ${Math.round(engine.bufferMinutes)}min vóór aanmelddeadline.`.trim();
-                }
+            const startSource = pickTask?.planned_start ?? task.planned_start;
+            const start = startSource ? new Date(startSource) : null;
+            if (!start || Number.isNaN(start.getTime())) {
+                return { order, planning: null, engineTask: task, awaitingEngine: true };
             }
-            return { order, planning };
+            const carrierCount = order.cartCount ?? task.payload?.loadCarriers?.length ?? 1;
+            const planning = {
+                ...base,
+                pickStartDate: start,
+                scheduledPickDate: start,
+                movedEarlier: false,
+                pickAssignments: [
+                    {
+                        date: start,
+                        cartCount: carrierCount,
+                        cartIndexes: Array.from({ length: carrierCount }, (_, i) => i),
+                    },
+                ],
+                reason: `Ingepland door de Logistics Engine (taak ${(pickTask ?? task).task_type}, regelversie ${(pickTask ?? task).rule_version ?? "-"}).`,
+                carrierName: carrier?.name ?? base.carrierName,
+            };
+            return { order, planning, engineTask: task, awaitingEngine: false };
         });
-        const distributed = distributePickDates(initial, {
-            enabled: Boolean(settings.pickDistributionEnabled),
-            maxWorkdaysEarlier: settings.maxWorkdaysEarlierPick ?? 0,
-            pickWeekdays,
-            getCartCount: (it) => it.order.cartCount ?? 1,
-            getCartOverride: (it, idx) => {
-                const src = it.order.source;
-                return overrideMap.get(`${src}#${it.order.id}#${idx}`) ?? null;
-            },
-        });
-        return distributed;
-    }, [ordersQuery.data, settingsQuery.data, carriersQuery.data, overridesQuery.data, engineConfigQuery.data]);
+    }, [ordersQuery.data, settingsQuery.data, carriersQuery.data, composeByRef, pickByRef]);
+    // Orders zonder taak melden we bij de Engine; zelf indelen mag niet.
+    const announced = useRef(new Set());
+    useEffect(() => {
+        for (const item of planned) {
+            if (!item.awaitingEngine || item.engineTask)
+                continue;
+            const ref = item.order.orderNumber || item.order.id;
+            if (!ref || announced.current.has(ref))
+                continue;
+            announced.current.add(ref);
+            void emitEngineEvent({
+                eventType: "order.received",
+                orderRef: ref,
+                shadow: true,
+                payload: {
+                    source: item.order.source,
+                    customerRef: item.order.customerName,
+                    deliveryDate: item.order.deliveryDate,
+                    deliveryType: item.order.deliveryType,
+                    lineCount: item.order.lineCount,
+                    hasStickers: Boolean(item.order.hasStickers),
+                },
+            });
+        }
+    }, [planned]);
     return {
         planned,
-        overrides: overridesQuery.data?.overrides ?? [],
-        isLoading: ordersQuery.isLoading || settingsQuery.isLoading || carriersQuery.isLoading || overridesQuery.isLoading || engineConfigQuery.isLoading,
+        awaiting: planned.filter((p) => p.awaitingEngine),
+        isLoading: ordersQuery.isLoading || settingsQuery.isLoading || carriersQuery.isLoading || tasksLoading,
         error: ordersQuery.data?.orders?.length ? undefined : ordersQuery.data?.error,
         warning: ordersQuery.data?.orders?.length ? ordersQuery.data?.error : undefined,
         refetch: () => {
             void ordersQuery.refetch();
             void settingsQuery.refetch();
             void carriersQuery.refetch();
-            void overridesQuery.refetch();
-            void engineConfigQuery.refetch();
+            refetchTasks();
         },
     };
 }

package/dist-lib/index.d.ts

@@ -14,9 +14,6 @@ export { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettin
 export { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
 export { PickstationPage } from "./components/pickstation/PickstationPage";
 export { KioskControle } from "./components/pickstation/KioskControle";
-export { StrategieenPage } from "./components/engine/StrategieenPage";
-export { FormulesPage } from "./components/engine/FormulesPage";
-export { CapaciteitsmaatregelenPage } from "./components/engine/CapaciteitsmaatregelenPage";
 export { calculateEarliestDeliveryDate, calculateOrderPlanning, DEFAULT_PICKUP_MOMENT, type EarliestDeliveryRules, type OrderPlanning, type PickupMoment, } from "./lib/planning";
 export { carrierLeadDaysFromMoments, normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget, type CarrierOrderTarget, type CarrierPlanningInfo, } from "./lib/carrierPlanning";
 export declare const floridayAfhandelingModule: FlowModule;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACzB,MAAM,uBAAuB,CAAC;AAK/B,eAAO,MAAM,yBAAyB,EAAE,UAmBvC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAEvE,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACzB,MAAM,uBAAuB,CAAC;AAK/B,eAAO,MAAM,yBAAyB,EAAE,UAkBvC,CAAC"}

package/dist-lib/index.js

@@ -1,4 +1,4 @@
-import { PackageCheck, CalendarCheck, CalendarRange, ClipboardCheck, Cpu } from "lucide-react";
+import { PackageCheck, CalendarCheck, CalendarRange, ClipboardCheck } from "lucide-react";
 export * from "./_core-safelist";
 export { LeveringenPage } from "./components/afhandeling/LeveringenPage";
 export { VervoerdersPage } from "./components/afhandeling/VervoerdersPage";
@@ -14,9 +14,6 @@ export { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettin
 export { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
 export { PickstationPage } from "./components/pickstation/PickstationPage";
 export { KioskControle } from "./components/pickstation/KioskControle";
-export { StrategieenPage } from "./components/engine/StrategieenPage";
-export { FormulesPage } from "./components/engine/FormulesPage";
-export { CapaciteitsmaatregelenPage } from "./components/engine/CapaciteitsmaatregelenPage";
 export { calculateEarliestDeliveryDate, calculateOrderPlanning, DEFAULT_PICKUP_MOMENT, } from "./lib/planning";
 export { carrierLeadDaysFromMoments, normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget, } from "./lib/carrierPlanning";
 import { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettingsCard";
@@ -33,7 +30,6 @@ export const floridayAfhandelingModule = {
             { label: "Pick Agenda", href: "/afhandeling/picking", icon: CalendarCheck },
             { label: "Planning en leveringen", href: "/afhandeling/leveringen", icon: CalendarRange },
             { label: "Controle karren", href: "/afhandeling/controle", icon: ClipboardCheck },
-            { label: "Logistieke Engine", href: "/afhandeling/engine/strategieen", icon: Cpu },
         ],
     },
     settingsCards: [