@flowselections/floriday-verkoop-module 1.0.51 → 1.0.53

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

@@ -23,7 +23,7 @@ export async function replanScopeInternal(scope) {
         throw new Error("replanScopeInternal: geen scope");
     let ordersQuery = supabaseAdmin
         .from("orders")
-        .select("id, custom_fields, plan_locked_at")
+        .select("id, order_number, custom_fields, plan_locked_at")
         .is("deleted_at", null);
     ordersQuery = bufferId
         ? ordersQuery.eq("buffer_id", bufferId)
@@ -31,6 +31,11 @@ export async function replanScopeInternal(scope) {
     const { data: orders } = await ordersQuery;
     const orderRows = (orders ?? []);
     const orderIds = orderRows.map((o) => o.id);
+    const orderNumberById = new Map();
+    for (const o of orderRows) {
+        if (o.order_number)
+            orderNumberById.set(o.id, String(o.order_number));
+    }
     if (orderRows.some((o) => o.plan_locked_at)) {
         return {
             ok: true,
@@ -53,26 +58,100 @@ export async function replanScopeInternal(scope) {
         throw new Error(itErr.message);
     // Onbekend blijft onbekend: geen ?? 1. De planner blokkeert regels
     // zonder (volledige) belading in plaats van 1×1×1 te plannen.
-    const pick = (a, b) => {
-        for (const v of [a, b]) {
-            if (v === null || v === undefined)
-                continue;
-            const n = Number(v);
-            if (Number.isFinite(n) && n > 0)
-                return Math.round(n);
+    const pos = (v) => {
+        if (v === null || v === undefined)
+            return null;
+        const n = Number(v);
+        return Number.isFinite(n) && n > 0 ? Math.round(n) : null;
+    };
+    /** Een bron telt alleen als álle drie de velden gevuld zijn (> 0). */
+    const completeSource = (plants_per_crate, crates_per_layer, layers_per_cart) => {
+        const a = pos(plants_per_crate);
+        const b = pos(crates_per_layer);
+        const c = pos(layers_per_cart);
+        return a && b && c ? { plants_per_crate: a, crates_per_layer: b, layers_per_cart: c } : null;
+    };
+    // Beladingbron per order: custom_fields.floriday_packing bevat de belading
+    // zoals die in Floriday op de order staat. Dat zijn de packing-VELDEN
+    // (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)
+            continue;
+        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 null;
+        return defaultProfile;
     };
+    let usedFloridayPacking = false;
     const inputs = (items ?? []).map((it) => {
         const prod = it.products ?? {};
+        // Volgorde: floriday_packing → orderregel → product. Niet coalescen per
+        // veld: een half-Floriday/half-orderregel-belading is geen belading.
+        const fromFloriday = floridayByOrder.get(it.order_id) ?? null;
+        const bel = fromFloriday ??
+            completeSource(it.plants_per_crate, it.crates_per_layer, it.layers_per_cart) ??
+            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,
             product_name: it.product_name,
             plants: Math.max(0, Number(it.quantity ?? 0)),
-            plants_per_crate: pick(it.plants_per_crate, prod.plants_per_crate),
-            crates_per_layer: pick(it.crates_per_layer, prod.crates_per_layer),
-            layers_per_cart: pick(it.layers_per_cart, prod.layers_per_cart),
+            plants_per_crate: bel?.plants_per_crate ?? null,
+            crates_per_layer: bel?.crates_per_layer ?? null,
+            layers_per_cart: layers,
+            load_carrier: loadCarrier,
         };
     });
     // Item → order-map voor het toewijzen van cart.order_id bij homogene karren.
@@ -81,48 +160,25 @@ 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;
     const { error: delErr } = await cartScope(supabaseAdmin.from("order_carts").delete());
     if (delErr)
         throw new Error(delErr.message);
-    // Floriday-packingConfiguration-fallback: alleen als de buffer precies één
-    // order bevat én die order een volledig Floriday-packingConfiguration heeft.
-    let usedFloridayPacking = false;
-    let plannedCarts = [];
+    // De karindeling wordt hier altijd zelf gerekend. custom_fields.floriday_packing
+    // 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.
+    const plannedCarts = [];
     const warnings = [];
     let blockedItems = [];
-    const solo = orderRows.length === 1 ? orderRows[0] : null;
-    const soloCustom = solo?.custom_fields ?? {};
-    const floridayPacking = soloCustom?.floriday_packing ?? null;
-    const isFo = solo && (soloCustom?.source === "floriday" || floridayPacking?.pieces_per_package);
-    if (isFo && floridayPacking && Array.isArray(floridayPacking.carts)) {
-        usedFloridayPacking = true;
-        plannedCarts = floridayPacking.carts.map((c, idx) => {
-            const cItems = (c.items ?? []).map((i) => ({
-                order_item_id: i.order_item_id,
-                product_id: i.product_id ?? null,
-                product_name: i.product_name ?? "—",
-                crates: Number(i.crates ?? 0),
-                plants: Number(i.plants ?? Number(i.crates ?? 0) * Number(i.plants_per_crate ?? 1)),
-                plants_per_crate: Math.max(1, Number(i.plants_per_crate ?? 1)),
-                crates_per_layer: Math.max(1, Number(i.crates_per_layer ?? 1)),
-                layers_per_cart: Math.max(1, Number(i.layers_per_cart ?? 1)),
-                layer_fraction: Number(i.layer_fraction ?? 1),
-                layer_share_pct: Number(i.layer_share_pct ?? 100),
-            }));
-            return {
-                cart_number: idx + 1,
-                source: "auto",
-                is_complete: !!c.is_complete,
-                occupancy_pct: Number(c.occupancy_pct ?? 100),
-                total_layers_used: Number(c.total_layers_used ?? 1),
-                items: cItems,
-            };
-        });
-    }
-    else {
+    {
         const [{ data: settings }, { data: overrides }] = await Promise.all([
             supabaseAdmin.from("cart_planning_settings").select("*").eq("id", 1).maybeSingle(),
             supabaseAdmin.from("cart_planning_product_overrides").select("product_id, never_mix"),
@@ -130,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.
@@ -154,9 +247,25 @@ export async function replanScopeInternal(scope) {
                 missing: b.missing,
             }));
             if (blockedOrderIds.length > 0) {
+                const FIELD_LABELS = {
+                    plants_per_crate: "planten per fust",
+                    crates_per_layer: "fusten per laag",
+                    layers_per_cart: "lagen per kar",
+                };
+                const nummers = blockedOrderIds
+                    .map((id) => orderNumberById.get(id) ?? id.slice(0, 8))
+                    .join(", ");
+                const velden = [
+                    ...new Set(blockedItems.flatMap((b) => b.missing)),
+                ]
+                    .map((f) => FIELD_LABELS[f] ?? f)
+                    .join(", ");
+                const reason = `Karindeling geblokkeerd voor order(s) ${nummers}: ` +
+                    `${blockedItems.length} orderregel(s) zonder volledige belading` +
+                    (velden ? ` (ontbreekt: ${velden})` : "") + ".";
                 const { error: blockErr } = await supabaseAdmin.rpc("logistics_plan_block", {
                     p_order_ids: blockedOrderIds,
-                    p_reason: "belading_onbekend",
+                    p_reason: reason,
                     p_details: { source: "floriday-verkoop-module/cart-replan", items: blockedItems },
                 });
                 if (blockErr) {
@@ -169,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) {
@@ -189,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")

package/dist-lib/lib/order-numbers.server.d.ts

@@ -0,0 +1,10 @@
+type MinimalClient = {
+    from: (table: string) => any;
+};
+/**
+ * Vertaalt Floriday sales-order-ids naar centrale ordernummers.
+ * Eén batch-query per 400 ids; ids zonder maprij ontbreken in de Map.
+ */
+export declare function resolveOrderNumbers(supabase: MinimalClient, foIds: Iterable<string>): Promise<Map<string, string>>;
+export {};
+//# sourceMappingURL=order-numbers.server.d.ts.map

package/dist-lib/lib/order-numbers.server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"order-numbers.server.d.ts","sourceRoot":"","sources":["../../src/lib/order-numbers.server.ts"],"names":[],"mappings":"AAKA,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;CAC9B,CAAC;AAIF;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GACtB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoB9B"}

package/dist-lib/lib/order-numbers.server.js

@@ -0,0 +1,30 @@
+// Eén bron voor het ophalen van centrale ordernummers van Floriday-orders.
+// floriday_order_number_map is leidend; deze helper wordt gebruikt door de
+// lijstquery, het orderdetail én de buffer-siblings, zodat er nooit meer
+// verschillende implementaties naast elkaar bestaan.
+const CHUNK = 400;
+/**
+ * Vertaalt Floriday sales-order-ids naar centrale ordernummers.
+ * Eén batch-query per 400 ids; ids zonder maprij ontbreken in de Map.
+ */
+export async function resolveOrderNumbers(supabase, foIds) {
+    const ids = Array.from(new Set(Array.from(foIds).map((v) => String(v ?? "")).filter((v) => v.length > 0)));
+    const out = new Map();
+    if (ids.length === 0)
+        return out;
+    for (let i = 0; i < ids.length; i += CHUNK) {
+        const chunk = ids.slice(i, i + CHUNK);
+        const { data, error } = await supabase
+            .from("floriday_order_number_map")
+            .select("floriday_id, order_number")
+            .in("floriday_id", chunk);
+        if (error)
+            throw new Error(error.message);
+        for (const row of (data ?? [])) {
+            const num = String(row?.order_number ?? "").trim();
+            if (num)
+                out.set(String(row.floriday_id), num);
+        }
+    }
+    return out;
+}

package/dist-lib/lib/salesorders-list.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjF,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAC;AAE3C,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,UAAU,CAAC,CAgtBrB"}
+{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjF,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAC;AAE3C,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AA8ID,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,UAAU,CAAC,CAqsBrB"}

package/dist-lib/lib/salesorders-list.server.js

@@ -4,6 +4,7 @@ import { normalizeLoadCarrierCode } from "./load-carriers";
 import { normalizeTime, resolveDeliveryTimeForDate } from "./carrier-availability";
 import { expandOrderItemsForPlanner } from "./expand-group-order-items";
 import { planCarts } from "./cart-planner";
+import { resolveOrderNumbers } from "./order-numbers.server";
 import { mergeStages, resolveOrderStage } from "./order-status";
 const FO_CAP = 20000;
 const LOCAL_CAP = 5000;
@@ -261,15 +262,7 @@ export async function buildSalesOrdersList(supabase, params) {
         }
     };
     const [orderNumberRows, customerRows, floridayCustomerRows, tradeItemRows, carrierRows, crateDescriptions, groupPacking,] = await Promise.all([
-        safe("Ordernummers", () => chunked(foIdsForNumbers, 400, async (chunk) => {
-            const { data, error } = await supabase
-                .from("floriday_order_number_map")
-                .select("floriday_id, order_number")
-                .in("floriday_id", chunk);
-            if (error)
-                throw new Error(error.message);
-            return (data ?? []);
-        }), []),
+        safe("Ordernummers", () => resolveOrderNumbers(supabase, foIdsForNumbers), new Map()),
         safe("Klanten", async () => {
             const orFilter = [
                 neededOrgIds.length ? `floriday_organization_id.in.(${neededOrgIds.join(",")})` : null,
@@ -318,10 +311,7 @@ export async function buildSalesOrdersList(supabase, params) {
         loadCrateDescriptions(supabase, warnings),
         safe("Productgroepen", () => loadGroupPacking(supabase), new Map()),
     ]);
-    const orderNumberByFoId = new Map();
-    for (const m of orderNumberRows) {
-        orderNumberByFoId.set(String(m.floriday_id), String(m.order_number ?? ""));
-    }
+    const orderNumberByFoId = orderNumberRows;
     const carrierById = new Map();
     for (const c of carrierRows)
         carrierById.set(String(c.id), c);