@flowselections/logistiek-engine 1.0.202 → 1.0.206

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

@@ -5,8 +5,9 @@
 // draait de pure planner per ladingdragertype en schrijft het resultaat weg
 // naar order_carts / order_cart_items.
 // ============================================================================
-import { planLoadUnits, LOAD_CARRIER_PLANNER_VERSION, } from "./loadCarrierPlanner.js";
+import { planLoadUnits, LOAD_CARRIER_PLANNER_VERSION, bepaalLaagMenging, } from "./loadCarrierPlanner.js";
 import { traceBatch } from "./trace.server.js";
+import { zonderQuarantaine } from "./quarantaine.js";
 import { MODULE_VERSION } from "./moduleVersion.js";
 import { fallbackCarrierProfile } from "./loadCarrierTypes.js";
 import { WAAR_INVULLEN, gewichtOnbekendTekst, ladingdragerNietInBeheerTekst } from "./invoerTeksten.js";
@@ -639,6 +640,7 @@ export function applyRulesToProfile(profile, rules) {
         layers_per_carrier: rules.maxLayers != null
             ? Math.max(1, Math.min(profile.layers_per_carrier || 1, rules.maxLayers))
             : profile.layers_per_carrier,
+        werkwijze_max_lagen: rules.maxLayers ?? null,
         max_boxes: rules.maxBoxes != null
             ? Math.min(profile.max_boxes ?? Number.MAX_SAFE_INTEGER, rules.maxBoxes)
             : profile.max_boxes ?? null,
@@ -1150,14 +1152,16 @@ async function replanBufferUnlocked(sb, bufferId, options = {}) {
         }
     }
     const idList = orderIds.length > 0 ? orderIds : ["00000000-0000-0000-0000-000000000000"];
-    const { data: rawItems } = await sb
+    const { data: rawItemsDb } = await sb
         .from("order_items")
         .select("id, order_id, product_id, product_name, quantity, unit, plants_per_crate, crates_per_layer, layers_per_cart, " +
-        "packing_locked_at, packing_locked_by, source_line_key, load_carrier_type, " +
+        "packing_locked_at, packing_locked_by, source_line_key, load_carrier_type, quarantined_at, " +
         "products(plants_per_crate, crates_per_layer, layers_per_cart, weight, floriday_trade_item_id, fust_type_id)")
         .in("order_id", idList)
         // Regels in quarantaine (Verkoop-herstel) nooit inplannen.
         .is("quarantined_at", null);
+    // 1.0.205: dubbele bescherming — ook na het lezen nooit regels in quarantaine plannen.
+    const rawItems = zonderQuarantaine((rawItemsDb ?? []));
     // 1.0.166: regels die in Floriday zijn afgehandeld nooit inplannen. Onleesbaar = niet plannen (fail closed).
     const { data: extern, error: externError } = await sb
         .from("logistics_external_fulfillment")
@@ -1819,7 +1823,16 @@ async function replanBufferUnlocked(sb, bufferId, options = {}) {
         }
         for (const [code, list] of groups) {
             const profile = applyRulesToProfile(profileFor(profiles, code), rules);
+            const maxBelPerLaag = rules && !rules.optimalFill ? 1 : (settings?.max_beladingen_per_layer ?? 2);
+            const mengregels = bepaalLaagMenging({
+                optimalFill: rules?.optimalFill ?? null,
+                maxBeladingenPerLayer: maxBelPerLaag,
+                maxCustomersPerLayer: rules?.maxCustomersPerLayer ?? null,
+                oneCustomerPerLayer: Boolean(settings?.max_one_customer_per_layer),
+            });
             const result = planLoadUnits(list, {
+                laagMenging: mengregels.menging,
+                laagGroepen: mengregels.groepen,
                 carrier: profile,
                 maxPartySharePerLayerPct: settings?.max_party_share_per_layer_pct ?? 50,
                 // Zonder optimale vulling wordt er niet bijgemengd in een laag.

package/dist-lib/lib/moduleVersion.d.ts

@@ -1,2 +1,2 @@
-export declare const MODULE_VERSION = "1.0.202";
+export declare const MODULE_VERSION = "1.0.206";
 //# sourceMappingURL=moduleVersion.d.ts.map

package/dist-lib/lib/moduleVersion.js

@@ -1,2 +1,2 @@
 // Automatisch gegenereerd door prebuild:lib; niet handmatig aanpassen.
-export const MODULE_VERSION = "1.0.202";
+export const MODULE_VERSION = "1.0.206";

package/dist-lib/lib/quarantaine.d.ts

@@ -0,0 +1,9 @@
+/** Is deze orderregel in quarantaine? */
+export declare function inQuarantaine(row: {
+    quarantined_at?: unknown;
+} | null | undefined): boolean;
+/** Alleen regels die niet in quarantaine staan. */
+export declare function zonderQuarantaine<T extends {
+    quarantined_at?: unknown;
+}>(rows: T[] | null | undefined): T[];
+//# sourceMappingURL=quarantaine.d.ts.map

package/dist-lib/lib/quarantaine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quarantaine.d.ts","sourceRoot":"","sources":["../../src/lib/quarantaine.ts"],"names":[],"mappings":"AAKA,yCAAyC;AACzC,wBAAgB,aAAa,CAAC,GAAG,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG3F;AAED,mDAAmD;AACnD,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,EAAE,CAE3G"}

package/dist-lib/lib/quarantaine.js

@@ -0,0 +1,13 @@
+// 1.0.205: orderregels in quarantaine (Verkoop-herstel, order_items.quarantined_at gevuld)
+// worden nergens in de Engine ingedeeld, geteld of verstuurd. Eén regel voor alle plekken:
+// planner, dekking, pakbonplan en Floriday-belading (SQL-kant: logistics_active.order_items
+// en filters op oi.quarantined_at IS NULL).
+/** Is deze orderregel in quarantaine? */
+export function inQuarantaine(row) {
+    const v = row?.quarantined_at;
+    return v !== null && v !== undefined && String(v).trim() !== "";
+}
+/** Alleen regels die niet in quarantaine staan. */
+export function zonderQuarantaine(rows) {
+    return (Array.isArray(rows) ? rows : []).filter((r) => !inQuarantaine(r));
+}

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

@@ -1 +1 @@
-{"version":3,"file":"shippingNoteQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/shippingNoteQueue.server.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAS5D,MAAM,WAAW,eAAe;IAC9B,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAoCD,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,eAAe,CAAC,CA8f1B;AAMD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,aAAa,GAAG,IAAI,CAAC;AAElE,qGAAqG;AACrG,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAQ9F;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAG5E;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,mBAAmB,GAAG,MAAM,CAI3E"}
+{"version":3,"file":"shippingNoteQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/shippingNoteQueue.server.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAS5D,MAAM,WAAW,eAAe;IAC9B,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAoCD,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,eAAe,CAAC,CA0gB1B;AAMD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,aAAa,GAAG,IAAI,CAAC;AAElE,qGAAqG;AACrG,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAQ9F;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAG5E;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,mBAAmB,GAAG,MAAM,CAI3E"}

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

@@ -376,6 +376,17 @@ export async function runShippingNoteQueue(sb, options = {}) {
             const slipPayload = slipRow["payload"] ?? {};
             const printPlekId = String(slipPayload["print_plek_id"] ?? "").trim() || null;
             const cartId = slipPayload["cart_id"] ?? row.cart_id;
+            // 1.0.201: een te hoge kar krijgt geen verzendbrief (fail-closed, wacht zonder poging).
+            if (cartId) {
+                const { data: hoog, error: hoogFout } = await sb.rpc("logistics_cart_te_hoog", { p_cart_id: cartId });
+                const tekst = hoogFout
+                    ? `Kon niet controleren of de kar te hoog is: ${hoogFout.message}`
+                    : hoog?.blokkade?.tekst;
+                if (tekst) {
+                    await houdVast(tekst);
+                    continue;
+                }
+            }
             // Layout op id: de actieve Floriday-afleverbrief (bij meerdere de standaard).
             const layout = await floridayLayout(sb, "afleverbrief", row.order_id);
             if (!layout.layoutId) {

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

@@ -1 +1 @@
-{"version":3,"file":"stickerQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/stickerQueue.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAuB5D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,wEAAwE;IACxE,UAAU,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpE;AAED,UAAU,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,SAAS,GAAG,aAAa,GAAG,eAAe,GAAG,mBAAmB,CAAC;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAKD,6EAA6E;AAC7E,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD,sGAAsG;AACtG,eAAO,MAAM,sBAAsB,UAA0F,CAAC;AAE9H,oDAAoD;AACpD,wBAAgB,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,MAAM,CAEzD;AAaD,wBAAsB,eAAe,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CA4b5G;AAoGD,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGzD;AAwGD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,cAAc,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAatD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtF"}
+{"version":3,"file":"stickerQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/stickerQueue.server.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAuB5D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,wEAAwE;IACxE,UAAU,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpE;AAED,UAAU,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,SAAS,GAAG,aAAa,GAAG,eAAe,GAAG,mBAAmB,CAAC;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAKD,6EAA6E;AAC7E,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD,sGAAsG;AACtG,eAAO,MAAM,sBAAsB,UAA0F,CAAC;AAE9H,oDAAoD;AACpD,wBAAgB,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,MAAM,CAEzD;AAaD,wBAAsB,eAAe,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAyc5G;AAoGD,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGzD;AAwGD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,cAAc,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAatD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtF"}

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

@@ -248,6 +248,19 @@ export async function runStickerQueue(sb, opts = {}) {
             run.blocked++;
             await trace(sb, { ...basis, step: `${label} niet geprint`, status: "waarschuwing", reason: reden });
         };
+        // 1.0.201: een kar die hoger is dan de ladingdrager toestaat krijgt geen stickers (fail-closed).
+        if (r.cart_id) {
+            const { data: hoog, error: hoogFout } = await sb.rpc("logistics_cart_te_hoog", { p_cart_id: r.cart_id });
+            if (hoogFout) {
+                await blokkeer(`Kon niet controleren of kar ${r.cart_id} te hoog is: ${hoogFout.message}`);
+                continue;
+            }
+            const tekst = hoog?.blokkade?.tekst;
+            if (tekst) {
+                await blokkeer(tekst);
+                continue;
+            }
+        }
         const later = async (reden) => {
             if (isHerprint) {
                 await trace(sb, { ...basis, step: `${label}: herprint opnieuw proberen`, status: "wachtend", reason: reden });

package/package.json

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