@flowselections/floriday-verkoop-module 1.0.52 → 1.0.54

package/dist-lib/lib/cart-replan.functions.js

@@ -76,6 +76,7 @@ export async function replanScopeInternal(scope) {
     // (pieces_per_package / packages_per_layer / layers_per_load_carrier) —
     // géén voorgekauwde karrenlijst; de karindeling rekenen we zelf.
     const floridayByOrder = new Map();
+    const loadCarrierByOrder = new Map();
     for (const o of orderRows) {
         const fp = (o.custom_fields ?? {})?.floriday_packing ?? null;
         if (!fp)
@@ -83,7 +84,48 @@ export async function replanScopeInternal(scope) {
         const bel = completeSource(fp.pieces_per_package, fp.packages_per_layer, fp.layers_per_load_carrier);
         if (bel)
             floridayByOrder.set(o.id, bel);
+        const lc = typeof fp.load_carrier === "string" ? fp.load_carrier.trim() : "";
+        if (lc)
+            loadCarrierByOrder.set(o.id, lc.toUpperCase());
     }
+    // ── Ladingdragerprofiel ────────────────────────────────────────────────
+    // Vertrouw NIET op de kolomdefault 'trolley' van order_carts: die verbergt
+    // dat er geen profielkeuze is gemaakt. Zonder profiel plannen we niet.
+    const { data: carrierProfiles } = await supabaseAdmin
+        .from("load_carrier_types")
+        .select("id, code, name, layers_per_carrier, is_active, is_default");
+    const activeProfiles = (carrierProfiles ?? []).filter((p) => p.is_active);
+    const defaultProfile = activeProfiles.find((p) => p.is_default) ??
+        activeProfiles.find((p) => String(p.code).toLowerCase() === "trolley") ??
+        null;
+    /** Floriday-ladingdragercode → code in load_carrier_types. */
+    const CARRIER_CODE_MAP = {
+        DANISH_TROLLEY: ["danish_container", "danish_trolley"],
+        DANISH_TROLLEY_NON_CC_RFID: ["danish_container"],
+        DANISH_TROLLEY_WATER_TRAY: ["danish_container"],
+        ONE_THIRD_DANISH_TROLLEY: ["danish_container"],
+        AUCTION_TROLLEY: ["auction_trolley", "trolley"],
+        EURO_TROLLEY: ["euro_rolcontainer", "trolley"],
+        ROLL_CONTAINER: ["euro_rolcontainer"],
+        EURO_PALLET: ["euro_pallet", "pallet"],
+        HT_EURO_PALLET: ["euro_pallet", "pallet"],
+        PALLET: ["pallet"],
+        BLOCK_PALLET: ["pallet"],
+        NONE: ["loose"],
+    };
+    const profileFor = (loadCarrier) => {
+        if (!loadCarrier)
+            return defaultProfile;
+        const direct = activeProfiles.find((p) => String(p.code).toUpperCase() === loadCarrier.toUpperCase());
+        if (direct)
+            return direct;
+        for (const code of CARRIER_CODE_MAP[loadCarrier.toUpperCase()] ?? []) {
+            const hit = activeProfiles.find((p) => String(p.code).toLowerCase() === code);
+            if (hit)
+                return hit;
+        }
+        return defaultProfile;
+    };
     let usedFloridayPacking = false;
     const inputs = (items ?? []).map((it) => {
         const prod = it.products ?? {};
@@ -95,6 +137,12 @@ export async function replanScopeInternal(scope) {
             completeSource(prod.plants_per_crate, prod.crates_per_layer, prod.layers_per_cart);
         if (bel && fromFloriday)
             usedFloridayPacking = true;
+        const loadCarrier = loadCarrierByOrder.get(it.order_id) ?? null;
+        // layers_per_cart = LEAST(profiel, bron) — identiek aan logistics_plan_buffer_sql.
+        const profileLayers = pos(profileFor(loadCarrier)?.layers_per_carrier);
+        const layers = bel?.layers_per_cart != null && profileLayers != null
+            ? Math.min(bel.layers_per_cart, profileLayers)
+            : (bel?.layers_per_cart ?? null);
         return {
             order_item_id: it.id,
             product_id: it.product_id,
@@ -102,7 +150,8 @@ export async function replanScopeInternal(scope) {
             plants: Math.max(0, Number(it.quantity ?? 0)),
             plants_per_crate: bel?.plants_per_crate ?? null,
             crates_per_layer: bel?.crates_per_layer ?? null,
-            layers_per_cart: bel?.layers_per_cart ?? null,
+            layers_per_cart: layers,
+            load_carrier: loadCarrier,
         };
     });
     // Item → order-map voor het toewijzen van cart.order_id bij homogene karren.
@@ -111,6 +160,11 @@ export async function replanScopeInternal(scope) {
         itemToOrder.set(it.id, it.order_id);
     }
     // Bestaande karren in de scope tellen (voor waarschuwing) en wissen.
+    // Nummering én delete-scope liggen altijd op bufferniveau als de order een
+    // buffer heeft; order-scope is uitsluitend terugval.
+    if (!bufferId) {
+        console.warn("[cart-replan] geen buffer voor order %s — nummering en delete vallen terug op order-scope", soloOrderId);
+    }
     const cartScope = (q) => bufferId ? q.eq("buffer_id", bufferId) : q.eq("order_id", soloOrderId);
     const { data: existingCarts } = await cartScope(supabaseAdmin.from("order_carts").select("id, source"));
     const replacedManualCount = (existingCarts ?? []).filter((c) => c.source === "manual").length;
@@ -121,7 +175,7 @@ export async function replanScopeInternal(scope) {
     // levert alleen de belading-VELDEN (pieces_per_package / packages_per_layer /
     // layers_per_load_carrier) — de mirror schrijft nooit een voorgekauwde
     // carts-array, dus die tak bestaat bewust niet meer.
-    let plannedCarts = [];
+    const plannedCarts = [];
     const warnings = [];
     let blockedItems = [];
     {
@@ -132,13 +186,50 @@ export async function replanScopeInternal(scope) {
         const neverMix = new Set((overrides ?? [])
             .filter((o) => o.never_mix && o.product_id)
             .map((o) => o.product_id));
-        const result = planCarts(inputs, {
-            maxPartySharePerLayerPct: settings?.max_party_share_per_layer_pct ?? 50,
-            maxBeladingenPerLayer: settings?.max_beladingen_per_layer ?? 2,
-            neverMixProductIds: neverMix,
-        });
-        plannedCarts = result.carts;
-        warnings.push(...result.warnings);
+        // Ladingdrager is een HARDE partitie: één planner-run per load_carrier.
+        // Items zonder load_carrier (lokale orders) vormen hun eigen partitie op
+        // het defaultprofiel.
+        const partitions = new Map();
+        for (const input of inputs) {
+            const key = input.load_carrier ?? "";
+            const list = partitions.get(key);
+            if (list)
+                list.push(input);
+            else
+                partitions.set(key, [input]);
+        }
+        const allBlocked = [];
+        let nextCartNumber = 1;
+        for (const [key, partitionInputs] of partitions) {
+            const profile = profileFor(key || null);
+            if (!profile) {
+                // Geen actief profiel én geen 'trolley': niet plannen, wel blokkeren.
+                for (const i of partitionInputs) {
+                    allBlocked.push({
+                        order_item_id: i.order_item_id,
+                        product_id: i.product_id,
+                        product_name: i.product_name,
+                        reason: "geen_belading",
+                        missing: ["load_carrier_profile"],
+                    });
+                }
+                warnings.push(`Geen actief ladingdragerprofiel gevonden${key ? ` voor ${key}` : ""} — karindeling overgeslagen.`);
+                continue;
+            }
+            const result = planCarts(partitionInputs, {
+                maxPartySharePerLayerPct: settings?.max_party_share_per_layer_pct ?? 50,
+                maxBeladingenPerLayer: settings?.max_beladingen_per_layer ?? 2,
+                neverMixProductIds: neverMix,
+                startCartNumber: nextCartNumber,
+            });
+            for (const cart of result.carts) {
+                nextCartNumber = Math.max(nextCartNumber, cart.cart_number + 1);
+                plannedCarts.push({ cart, profile });
+            }
+            warnings.push(...result.warnings);
+            allBlocked.push(...result.blocked);
+        }
+        const result = { blocked: allBlocked };
         // Regels zonder (volledige) belading: NOOIT karren maken. Meld de
         // blokkade aan de logistiek-engine zodat die zichtbaar wordt in
         // logistics_plan_queue / logistics_events / logistics_decisions.
@@ -187,7 +278,7 @@ export async function replanScopeInternal(scope) {
         }
     }
     let cartsCreated = 0;
-    for (const cart of plannedCarts) {
+    for (const { cart, profile } of plannedCarts) {
         // Bepaal cart.order_id: null bij mix van orders, anders die ene order.
         const orderIdsOnCart = new Set();
         for (const i of cart.items) {
@@ -207,6 +298,10 @@ export async function replanScopeInternal(scope) {
             source: usedFloridayPacking ? "floriday" : "auto",
             occupancy_pct: cart.occupancy_pct,
             total_layers_used: cart.total_layers_used,
+            // Profiel expliciet meegeven; nooit leunen op de kolomdefault.
+            carrier_type: profile.code,
+            carrier_type_id: profile.id,
+            max_layers: profile.layers_per_carrier ?? null,
             algorithm_version: CART_PLANNER_VERSION,
         })
             .select("id")
@@ -306,22 +401,95 @@ export async function drainCartReplanQueue(limit = 50) {
 // ─── Lezen — voor de UI ─────────────────────────────────────────────────────
 // Retourneert alle karren van de buffer waarin de order valt, zodat karren
 // die items van meerdere orders bevatten volledig zichtbaar zijn.
+// Levert ook de order-context (nummers per orderregel) en, als er geen karren
+// zijn, de laatste blokkadereden uit de engine (logistics_decisions /
+// logistics_plan_queue). De UI berekent NIETS zelf: hij toont wat er staat.
 export const listOrderCarts = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
     .inputValidator((input) => z.object({ orderId: z.string().uuid() }).parse(input))
     .handler(async ({ data, context }) => {
     const { data: order } = await context.supabase
         .from("orders")
-        .select("buffer_id")
+        .select("buffer_id, plan_locked_at")
         .eq("id", data.orderId)
         .maybeSingle();
     const bufferId = order?.buffer_id;
-    const select = "id, order_id, buffer_id, cart_number, source, is_complete, occupancy_pct, total_layers_used, algorithm_version, notes, order_cart_items(id, order_item_id, product_id, product_name, crates, plants_per_crate, crates_per_layer, layers_per_cart, layer_fraction, layer_share_pct)";
+    const planLockedAt = order?.plan_locked_at ?? null;
+    const select = "id, order_id, buffer_id, cart_number, source, is_complete, occupancy_pct, total_layers_used, algorithm_version, carrier_type, max_layers, notes, order_cart_items(id, order_item_id, product_id, product_name, crates, plants_per_crate, crates_per_layer, layers_per_cart, layer_fraction, layer_share_pct)";
     const base = context.supabase.from("order_carts").select(select);
     const { data: carts } = await (bufferId
         ? base.eq("buffer_id", bufferId)
         : base.eq("order_id", data.orderId)).order("cart_number");
-    return { carts: carts ?? [], bufferId };
+    // Orders in de scope + ordernummer per orderregel (voor de badges).
+    let orders = [];
+    if (bufferId) {
+        const { data: sibs } = await context.supabase
+            .from("orders")
+            .select("id, order_number")
+            .eq("buffer_id", bufferId)
+            .is("deleted_at", null);
+        orders = (sibs ?? []).map((o) => ({
+            id: o.id,
+            order_number: o.order_number ?? null,
+        }));
+    }
+    if (orders.length === 0) {
+        const { data: own } = await context.supabase
+            .from("orders")
+            .select("id, order_number")
+            .eq("id", data.orderId)
+            .maybeSingle();
+        if (own) {
+            orders = [{ id: own.id, order_number: own.order_number ?? null }];
+        }
+    }
+    const orderIds = orders.map((o) => o.id);
+    let itemOrders = [];
+    if (orderIds.length > 0) {
+        const { data: its } = await context.supabase
+            .from("order_items")
+            .select("id, order_id")
+            .in("order_id", orderIds);
+        itemOrders = (its ?? []).map((i) => ({
+            id: i.id,
+            order_id: i.order_id,
+        }));
+    }
+    // Blokkadereden alleen ophalen als er niets gepland staat.
+    let blocked = null;
+    if ((carts ?? []).length === 0 && orderIds.length > 0) {
+        const { data: dec } = await context.supabase
+            .from("logistics_decisions")
+            .select("subject_id, slot, explanation, result, created_at")
+            .in("subject_id", orderIds)
+            .order("created_at", { ascending: false })
+            .limit(1);
+        const d = (dec ?? [])[0];
+        if (d) {
+            blocked = {
+                reason: d.result?.reason ?? d.slot ?? null,
+                explanation: d.explanation ?? null,
+                at: d.created_at ?? null,
+            };
+        }
+        if (!blocked) {
+            const { data: q } = await context.supabase
+                .from("logistics_plan_queue")
+                .select("order_id, status, reason, error, updated_at")
+                .in("order_id", orderIds)
+                .order("updated_at", { ascending: false })
+                .limit(1);
+            const r = (q ?? [])[0];
+            if (r && (r.error || r.reason)) {
+                blocked = {
+                    reason: r.reason ?? null,
+                    explanation: r.error ?? null,
+                    at: r.updated_at ?? null,
+                };
+            }
+        }
+    }
+    return { carts: carts ?? [], bufferId, planLockedAt, orders, itemOrders, blocked };
 });
 export const replanBufferForOrder = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-verkoop-module",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "private": false,
   "sideEffects": false,
   "type": "module",