@flowselections/floriday-afhandeling-module 1.0.9 → 1.0.10

package/dist-lib/lib/planning.js

@@ -116,62 +116,125 @@ export function calculateOrderPlanning(deliveryDate, rules) {
         transportRegisterDate: transportRegister,
         pickStartDate: pickStart,
         scheduledPickDate: pickStart,
+        pickAssignments: [{ date: pickStart, cartCount: 0 }],
         movedEarlier: false,
         selectedMoment: moment,
     };
 }
 export function distributePickDates(items, options) {
-    if (!options.enabled || options.maxWorkdaysEarlier <= 0) {
-        return items.map((it) => {
-            if (!it.planning)
-                return it;
-            return {
-                ...it,
-                planning: {
-                    ...it.planning,
-                    scheduledPickDate: it.planning.pickStartDate,
-                    movedEarlier: false,
-                },
-            };
-        });
-    }
+    const getCarts = (it) => {
+        const n = options.getCartCount?.(it);
+        return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
+    };
+    const getOverride = (it, idx) => {
+        const raw = options.getCartOverride?.(it, idx);
+        if (!raw)
+            return null;
+        const date = raw instanceof Date ? raw : raw.date;
+        const out = new Date(date);
+        out.setHours(0, 0, 0, 0);
+        const movedFrom = raw instanceof Date ? null : raw.movedFromDate;
+        const movedFromDate = movedFrom ? new Date(movedFrom) : null;
+        if (movedFromDate)
+            movedFromDate.setHours(0, 0, 0, 0);
+        return { date: out, movedFromDate };
+    };
+    const key = (d) => `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
+    const load = new Map();
+    const result = new Map();
+    const distribute = options.enabled && options.maxWorkdaysEarlier > 0;
     const sorted = [...items].sort((a, b) => {
         const ad = a.planning?.pickStartDate.getTime() ?? Infinity;
         const bd = b.planning?.pickStartDate.getTime() ?? Infinity;
         return ad - bd;
     });
-    const load = new Map();
-    const key = (d) => `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
-    const result = new Map();
+    const baseTargets = new Map();
+    // Stap 1: bepaal eerst de volledige automatische verdeling, zonder
+    // handmatige overrides. Daardoor blijft de automatische balans stabiel en
+    // kan een latere handmatige verplaatsing niet door volgende orders worden
+    // "teruggevuld".
     for (const item of sorted) {
         if (!item.planning) {
             result.set(item, item);
             continue;
         }
         const deadline = item.planning.pickStartDate;
-        const candidates = [deadline];
-        let cursor = deadline;
-        for (let i = 0; i < options.maxWorkdaysEarlier; i++) {
-            cursor = subtractWorkdays(cursor, 1, options.holidays);
-            candidates.unshift(cursor);
+        const carts = getCarts(item);
+        // Kandidaten in chronologische volgorde
+        const candidates = [];
+        if (distribute) {
+            let cursor = deadline;
+            for (let i = 0; i < options.maxWorkdaysEarlier; i++) {
+                cursor = subtractWorkdays(cursor, 1, options.holidays);
+                candidates.unshift(cursor);
+            }
         }
-        let best = candidates[0];
-        let bestLoad = load.get(key(best)) ?? 0;
-        for (let i = 1; i < candidates.length; i++) {
-            const c = candidates[i];
-            const l = load.get(key(c)) ?? 0;
-            if (l < bestLoad) {
-                best = c;
-                bestLoad = l;
+        candidates.push(deadline);
+        const targets = [];
+        for (let c = 0; c < carts; c++) {
+            let target;
+            if (!distribute) {
+                target = deadline;
+                load.set(key(target), (load.get(key(target)) ?? 0) + 1);
+            }
+            else {
+                let best = candidates[candidates.length - 1];
+                let bestLoad = load.get(key(best)) ?? 0;
+                for (let i = candidates.length - 2; i >= 0; i--) {
+                    const cand = candidates[i];
+                    const l = load.get(key(cand)) ?? 0;
+                    if (l < bestLoad) {
+                        best = cand;
+                        bestLoad = l;
+                    }
+                }
+                target = best;
+                load.set(key(target), bestLoad + 1);
+            }
+            targets[c] = target;
+        }
+        baseTargets.set(item, targets);
+    }
+    // Stap 2: pas overrides pas toe nadat alle automatische doelen vaststaan.
+    // Dit maakt een verplaatsing absoluut: 10/10 wordt na één kar verplaatsen
+    // echt 9/11, niet opnieuw 10/10 door load-balancing.
+    for (const item of sorted) {
+        if (!item.planning)
+            continue;
+        const deadline = item.planning.pickStartDate;
+        const carts = getCarts(item);
+        const targets = [...(baseTargets.get(item) ?? [])];
+        const perDay = new Map();
+        for (let c = 0; c < carts; c++) {
+            const override = getOverride(item, c);
+            if (override) {
+                // Handmatige verplaatsingen gelden altijd voor de concrete kar-index
+                // die de gebruiker aanklikt. Niet ruilen met een andere kar op dezelfde
+                // brondag, want dan blijft de aangeklikte kar visueel staan.
+                targets[c] = override.date;
+            }
+        }
+        for (let c = 0; c < carts; c++) {
+            const target = targets[c];
+            const k = key(target);
+            const existing = perDay.get(k);
+            if (existing) {
+                existing.cartCount += 1;
+                existing.cartIndexes.push(c);
+            }
+            else {
+                perDay.set(k, { date: target, cartCount: 1, cartIndexes: [c] });
             }
         }
-        load.set(key(best), bestLoad + 1);
-        const moved = best.getTime() !== deadline.getTime();
+        const assignments = Array.from(perDay.values()).sort((a, b) => a.date.getTime() - b.date.getTime());
+        const earliest = assignments[0]?.date ?? deadline;
+        const moved = assignments.some((a) => a.date.getTime() !== deadline.getTime());
         result.set(item, {
             ...item,
             planning: {
                 ...item.planning,
-                scheduledPickDate: best,
+                scheduledPickDate: earliest,
+                pickAssignments: assignments,
                 movedEarlier: moved,
             },
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-afhandeling-module",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "private": false,
   "sideEffects": false,
   "type": "module",
@@ -41,7 +41,7 @@
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
     "@flowselections/core": "^1.0.11",
-    "@lovable.dev/vite-tanstack-config": "2.6.2",
+    "@lovable.dev/vite-tanstack-config": "2.6.4",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",
     "@tanstack/react-query": "^5.83.0",