@flowselections/logistiek-engine 1.0.15 → 1.0.16

package/dist-lib/lib/loadCarrierPlanning.server.d.ts

@@ -45,6 +45,12 @@ export interface BeladingRules {
 export declare function loadBeladingRules(sb: SupabaseClient): Promise<BeladingRules | null>;
 /** Past de grenzen uit de werkwijze toe op het capaciteitsprofiel van een ladingdrager. */
 export declare function applyRulesToProfile(profile: CarrierProfile, rules: BeladingRules | null): CarrierProfile;
+/**
+ * Verdeelt de planten over ladingdragers volgens de Floriday-verhouding:
+ * planten per kar = pieces_per_package x packages_per_layer x layers_per_load_carrier.
+ * Geen optimalisatie, geen mengregels, geen laagherverdeling — alleen vullen.
+ */
+export declare function planByFloridayPacking(inputs: PlannerInputItem[], profile: CarrierProfile, packing: Belading): PlannedLoadUnit[];
 export interface ReplanResult {
     ok: boolean;
     bufferId: string;

package/dist-lib/lib/loadCarrierPlanning.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadCarrierPlanning.server.d.ts","sourceRoot":"","sources":["../../src/lib/loadCarrierPlanning.server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadCarrierPlanning.server.d.ts","sourceRoot":"","sources":["../../src/lib/loadCarrierPlanning.server.ts"],"names":[],"mappings":"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"}

package/dist-lib/lib/loadCarrierPlanning.server.js

@@ -342,6 +342,75 @@ export function applyRulesToProfile(profile, rules) {
     };
 }
 // ---------------------------------------------------------------------------
+// Overname-pad: de beladingverhouding van Floriday letterlijk volgen
+// ---------------------------------------------------------------------------
+/**
+ * Verdeelt de planten over ladingdragers volgens de Floriday-verhouding:
+ * planten per kar = pieces_per_package x packages_per_layer x layers_per_load_carrier.
+ * Geen optimalisatie, geen mengregels, geen laagherverdeling — alleen vullen.
+ */
+export function planByFloridayPacking(inputs, profile, packing) {
+    const ppc = Math.max(1, packing.plants_per_crate);
+    const cpl = Math.max(1, packing.crates_per_layer);
+    const lpc = Math.max(1, packing.layers_per_cart);
+    const perCart = ppc * cpl * lpc;
+    const carts = [];
+    let current = null;
+    let currentPlants = 0;
+    const openCart = () => {
+        current = {
+            cart_number: carts.length + 1,
+            carrier_type: profile.code,
+            carrier_type_id: profile.id ?? null,
+            source: "auto",
+            is_complete: false,
+            occupancy_pct: 0,
+            total_layers_used: 0,
+            max_layers: lpc,
+            weight_kg: null,
+            items: [],
+        };
+        currentPlants = 0;
+        carts.push(current);
+    };
+    for (const input of inputs) {
+        let left = Math.max(0, Math.round(input.plants));
+        while (left > 0) {
+            if (!current || currentPlants >= perCart)
+                openCart();
+            const cart = current;
+            const take = Math.min(left, perCart - currentPlants);
+            const crates = Math.max(1, Math.ceil(take / ppc));
+            const layerFraction = crates / cpl;
+            const item = {
+                order_item_id: input.order_item_id,
+                order_id: input.order_id ?? null,
+                product_id: input.product_id,
+                product_name: input.product_name,
+                crates,
+                plants: take,
+                boxes: crates,
+                weight_kg: input.weight_per_crate != null ? Number((input.weight_per_crate * crates).toFixed(2)) : null,
+                plants_per_crate: ppc,
+                crates_per_layer: cpl,
+                layers_per_cart: lpc,
+                layer_fraction: Number(layerFraction.toFixed(3)),
+                layer_share_pct: Number(((100 * layerFraction) / lpc).toFixed(2)),
+            };
+            cart.items.push(item);
+            currentPlants += take;
+            left -= take;
+            cart.total_layers_used = Number(cart.items.reduce((s, i) => s + i.layer_fraction, 0).toFixed(2));
+            cart.occupancy_pct = Number(((100 * currentPlants) / perCart).toFixed(1));
+            cart.is_complete = currentPlants >= perCart;
+            cart.weight_kg = cart.items.some((i) => i.weight_kg != null)
+                ? Number(cart.items.reduce((s, i) => s + (i.weight_kg ?? 0), 0).toFixed(2))
+                : null;
+        }
+    }
+    return carts;
+}
+// ---------------------------------------------------------------------------
 // Herplannen van een buffer
 // ---------------------------------------------------------------------------
 /** Maximaal aantal ladingdragers dat één orderbuffer mag opleveren. */
@@ -447,25 +516,22 @@ export async function replanBufferInternal(sb, bufferId, options = {}) {
     }
     let plannedCarts = [];
     let usedFloridayPacking = false;
+    // Overname-pad: één order in de buffer én een volledige Floriday-verpakking.
+    // Dan neemt de engine de verhouding van Floriday over en optimaliseert niet.
+    // (De oude tak eiste `floriday_packing.carts` als array; Floriday stuurt zo'n
+    // kant-en-klare karrenlijst nergens mee, die tak is nooit genomen en is
+    // daarom verwijderd.)
     const solo = orderRows.length === 1 ? orderRows[0] : null;
-    const floridayPacking = solo?.custom_fields?.floriday_packing ?? null;
-    const isFo = solo && (solo.custom_fields?.source === "floriday" || floridayPacking?.pieces_per_package);
-    if (isFo && floridayPacking && Array.isArray(floridayPacking.carts)) {
+    const soloPacking = solo ? beladingFromFloridayPacking(solo.custom_fields?.floriday_packing) : null;
+    const takeoverProfile = profileFor(profiles, options.carrierType ?? defaultProfile.code);
+    const takeoverAllowed = takeoverProfile.capacity_model === "layered" || takeoverProfile.capacity_model === "stacked";
+    if (solo && soloPacking && takeoverAllowed) {
         usedFloridayPacking = true;
-        const code = options.carrierType ?? floridayPacking.carrier_type ?? defaultProfile.code;
-        const profile = profileFor(profiles, code);
-        plannedCarts = floridayPacking.carts.map((c, idx) => ({
-            cart_number: idx + 1,
-            carrier_type: profile.code,
-            carrier_type_id: profile.id ?? null,
-            source: "auto",
-            is_complete: Boolean(c.is_complete),
-            occupancy_pct: Number(c.occupancy_pct ?? 100),
-            total_layers_used: Number(c.total_layers_used ?? profile.layers_per_carrier),
-            max_layers: profile.layers_per_carrier,
-            weight_kg: null,
-            items: Array.isArray(c.items) ? c.items : [],
-        }));
+        plannedCarts = planByFloridayPacking(inputs, takeoverProfile, soloPacking);
+        console.log(`[logistiek-engine] buffer ${bufferId}: overname Floriday-verpakking ` +
+            `(${soloPacking.plants_per_crate}x${soloPacking.crates_per_layer}x${soloPacking.layers_per_cart} = ` +
+            `${soloPacking.plants_per_crate * soloPacking.crates_per_layer * soloPacking.layers_per_cart} planten/kar) ` +
+            `-> ${plannedCarts.length} ladingdragers`);
     }
     else {
         // Ladingdrager per orderregel bepalen en per type een ronde draaien.