@flowselections/logistiek-engine 1.0.14 → 1.0.16

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

@@ -14,6 +14,7 @@ const EMPTY = {
     planned: 0,
     cartsCreated: 0,
     skippedLocked: 0,
+    blocked: 0,
     failed: 0,
     errors: [],
 };
@@ -52,6 +53,7 @@ export async function runPlanQueue(sb, options = {}) {
                     touchedDates.add(String(g.plan_date).slice(0, 10));
             }
             const bufferId = group.find((g) => g.buffer_id)?.buffer_id ?? null;
+            let blocked = false;
             if (bufferId) {
                 if (!plannedBuffers.has(bufferId)) {
                     plannedBuffers.add(bufferId);
@@ -59,6 +61,12 @@ export async function runPlanQueue(sb, options = {}) {
                     if (plan.skipped === "locked") {
                         result.skippedLocked++;
                     }
+                    else if (plan.skipped === "blocked") {
+                        blocked = true;
+                        result.blocked++;
+                        if (result.errors.length < 5 && plan.blockedReason)
+                            result.errors.push(plan.blockedReason);
+                    }
                     else {
                         result.planned++;
                         result.cartsCreated += Number(plan.cartsCreated ?? 0);
@@ -68,15 +76,25 @@ export async function runPlanQueue(sb, options = {}) {
             }
             else {
                 const plan = await replanOrderInternal(sb, row.order_id);
-                if (plan && plan.skipped !== "locked") {
+                if (plan?.skipped === "locked") {
+                    result.skippedLocked++;
+                }
+                else if (plan?.skipped === "blocked") {
+                    blocked = true;
+                    result.blocked++;
+                    if (result.errors.length < 5 && plan.blockedReason)
+                        result.errors.push(plan.blockedReason);
+                }
+                else if (plan) {
                     result.planned++;
                     result.cartsCreated += Number(plan.cartsCreated ?? 0);
                     await attachIndelingToTasks(sb, plan);
                 }
-                else if (plan?.skipped === "locked") {
-                    result.skippedLocked++;
-                }
             }
+            // De blokkade zet de wachtrijregel zelf al op 'geblokkeerd'; die mag niet
+            // alsnog als afgerond worden weggeschreven.
+            if (blocked)
+                continue;
             // Orders zonder taken krijgen een order.received-event, zodat de
             // taakdispatcher er taken van maakt.
             for (const g of group.length > 0 ? group : [{ order_id: row.order_id }]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/logistiek-engine",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "flowselections": {
     "moduleId": "logistiek-engine",
     "pages": [