@flowselections/floriday-verkoop-module 1.0.49 → 1.0.51

package/dist-lib/lib/cart-planner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cart-planner.d.ts","sourceRoot":"","sources":["../../src/lib/cart-planner.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,uEAAuE;IACvE,cAAc,EAAE,MAAM,CAAC;IACvB,kEAAkE;IAClE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,gFAAgF;IAChF,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,0EAA0E;IAC1E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kDAAkD;IAClD,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClC;AAqJD,wBAAgB,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,aAAa,CAsH7F"}
+{"version":3,"file":"cart-planner.d.ts","sourceRoot":"","sources":["../../src/lib/cart-planner.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC5C,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC5C,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC5C;AAGD,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,uEAAuE;IACvE,cAAc,EAAE,MAAM,CAAC;IACvB,kEAAkE;IAClE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAED,2EAA2E;AAC3E,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,GAAG,sBAAsB,CAAC;IACjD,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,uDAAuD;IACvD,OAAO,EAAE,kBAAkB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,gFAAgF;IAChF,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,0EAA0E;IAC1E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kDAAkD;IAClD,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClC;AA+JD,wBAAgB,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,aAAa,CAqJ7F"}

package/dist-lib/lib/cart-planner.js

@@ -10,7 +10,9 @@
 //     * som per laag ≤ 100%,
 //     * laag-hoogte bij combinatie = max(laag-hoogte partijen) (veiligheid),
 //     * totaal-hoogte per kar ≤ 100%.
-export const CART_PLANNER_VERSION = 1;
+// Houd deze waarde gelijk aan LOAD_CARRIER_PLANNER_VERSION in de
+// logistiek-engine: beide worden SAMEN opgehoogd bij een algoritmewijziging.
+export const CART_PLANNER_VERSION = 3;
 const DEFAULT_OPTIONS = {
     maxPartySharePerLayerPct: 50,
     maxBeladingenPerLayer: 2,
@@ -129,18 +131,48 @@ export function planCarts(inputs, options) {
         neverMixProductIds: options?.neverMixProductIds ?? DEFAULT_OPTIONS.neverMixProductIds,
     };
     const warnings = [];
+    const blocked = [];
     const carts = [];
     let cartNumber = 1;
-    // Normaliseer inputs, filter lege.
-    const items = inputs
-        .map((i) => ({
-        ...i,
-        plants: Math.max(0, Math.round(i.plants)),
-        plants_per_crate: Math.max(1, Math.round(i.plants_per_crate || 1)),
-        crates_per_layer: Math.max(1, Math.round(i.crates_per_layer || 1)),
-        layers_per_cart: Math.max(1, Math.round(i.layers_per_cart || 1)),
-    }))
-        .filter((i) => i.plants > 0);
+    const num = (v) => {
+        if (v === null || v === undefined)
+            return null;
+        const n = Math.round(Number(v));
+        return Number.isFinite(n) && n > 0 ? n : null;
+    };
+    // Normaliseer inputs. GEEN terugval op 1: ontbrekende belading blokkeert.
+    const items = [];
+    for (const i of inputs) {
+        const plants = Math.max(0, Math.round(Number(i.plants) || 0));
+        if (plants <= 0)
+            continue;
+        const ppc = num(i.plants_per_crate);
+        const cpl = num(i.crates_per_layer);
+        const lpc = num(i.layers_per_cart);
+        const missing = [
+            ppc === null ? "plants_per_crate" : null,
+            cpl === null ? "crates_per_layer" : null,
+            lpc === null ? "layers_per_cart" : null,
+        ].filter((m) => m !== null);
+        if (missing.length > 0) {
+            blocked.push({
+                order_item_id: i.order_item_id,
+                product_id: i.product_id,
+                product_name: i.product_name,
+                reason: missing.length === 3 ? "geen_belading" : "onvolledige_belading",
+                missing,
+            });
+            warnings.push(`Geen karren gepland voor "${i.product_name}": belading onbekend (${missing.join(", ")}).`);
+            continue;
+        }
+        items.push({
+            ...i,
+            plants,
+            plants_per_crate: ppc,
+            crates_per_layer: cpl,
+            layers_per_cart: lpc,
+        });
+    }
     // Stap A: volledige karren per artikel.
     const rests = [];
     for (const it of items) {
@@ -230,5 +262,5 @@ export function planCarts(inputs, options) {
             items,
         });
     }
-    return { carts, warnings };
+    return { carts, warnings, blocked };
 }