@flowselections/logistiek-engine 1.0.27 → 1.0.28

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

@@ -1 +1 @@
-{"version":3,"file":"logisticsPlanner.d.ts","sourceRoot":"","sources":["../../src/lib/logisticsPlanner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAc,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAO/F,MAAM,MAAM,eAAe,GACvB,SAAS,GACT,kBAAkB,GAClB,mBAAmB,GACnB,QAAQ,GACR,aAAa,GACb,OAAO,CAAC;AAEZ,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,wFAAwF;IACxF,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,+EAA+E;IAC/E,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC;IACF,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAgDD,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,QAAQ,EAAE,kBAAkB,GAC3B;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CASpC;AAMD,wBAAgB,SAAS,CACvB,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,GAAE,cAAmB,GAC3B,aAAa,CAqSf"}
+{"version":3,"file":"logisticsPlanner.d.ts","sourceRoot":"","sources":["../../src/lib/logisticsPlanner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAc,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAO/F,MAAM,MAAM,eAAe,GACvB,SAAS,GACT,kBAAkB,GAClB,mBAAmB,GACnB,QAAQ,GACR,aAAa,GACb,OAAO,CAAC;AAEZ,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,wFAAwF;IACxF,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,+EAA+E;IAC/E,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC;IACF,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAgDD,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,QAAQ,EAAE,kBAAkB,GAC3B;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CASpC;AAMD,wBAAgB,SAAS,CACvB,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,GAAE,cAAmB,GAC3B,aAAa,CAyTf"}

package/dist-lib/lib/logisticsPlanner.js

@@ -67,10 +67,12 @@ export function planOrder(order, settings, context = {}) {
     const pickStep = fields(settings, "order_picken");
     const controleStep = fields(settings, "controle");
     // --- 1. Orderbuffer ------------------------------------------------------
+    // Het sluitmoment kan vanaf de aanmeldtijd of vanaf de pickstart worden
+    // teruggerekend. De pickstart is pas na stap 4 bekend; bufferCloseAt wordt
+    // daarom verderop definitief gezet.
     const bufferEnabled = bool(orderStep.buffer_enabled, true);
-    const bufferCloseAt = bufferEnabled
-        ? shift(checkinAt, -num(orderStep.buffer_close_before_minutes, 60))
-        : null;
+    const bufferCloseMinutes = num(orderStep.buffer_close_before_minutes, 60);
+    const bufferCloseReference = str(orderStep.buffer_close_reference, "checkin");
     const bufferRelease = str(orderStep.buffer_release, "auto");
     if (bufferRelease === "none") {
         notes.push("De buffer geeft niets automatisch vrij; iemand moet de order handmatig oppakken.");
@@ -117,6 +119,10 @@ export function planOrder(order, settings, context = {}) {
     else if (new Date(pickEndAt) < new Date(pickStartAt)) {
         pickEndAt = shift(pickStartAt, Math.max(pickMinutes, 1));
     }
+    // Nu de pickstart vaststaat kan het sluitmoment definitief worden bepaald.
+    const bufferCloseAt = bufferEnabled
+        ? shift(bufferCloseReference === "pick_start" ? pickStartAt : checkinAt, -bufferCloseMinutes)
+        : null;
     if (bufferCloseAt && new Date(bufferCloseAt) > new Date(pickStartAt)) {
         notes.push("De buffer sluit later dan het picken zou moeten beginnen; controleer de buffertijd.");
     }
@@ -144,6 +150,8 @@ export function planOrder(order, settings, context = {}) {
         add("buffer.close", bufferCloseAt, bufferCloseAt, {
             bufferRef: order.bufferRef ?? null,
             release: bufferRelease,
+            closeReference: bufferCloseReference,
+            closeBeforeMinutes: bufferCloseMinutes,
             matchCriteria: normalizeBufferCriteria(orderStep.buffer_match),
         });
     }
@@ -213,9 +221,9 @@ export function planOrder(order, settings, context = {}) {
     const packingRelease = str(docStep.packing_slip_release, "with_pick_release");
     const packingAt = docRelease(packingRelease, num(docStep.packing_slip_hours_before, 2));
     const pickMode = configuredPickMode;
-    const groupIdenticalCarts = (pickMode === "cart" || pickMode === "smallest") &&
-        bool(docStep.packing_slip_group_identical_carts, true);
-    const barcodeEnabled = bool(docStep.packing_slip_barcode, true);
+    // Bundelen van gelijke karren en het tonen van de barcode zijn opmaakkeuzes
+    // van de Layout maker; de Engine levert alleen layout, variant en barcode.
+    const groupIdenticalCarts = pickMode === "cart" || pickMode === "smallest";
     // Eén pakbon per kar. De laatste (of enige) kar van een order is de deelkar en
     // krijgt daarom de deelorder-layout; alle voorgaande karren zijn volle karren.
     const cartTotal = Math.max(1, totalCarriers);
@@ -233,18 +241,25 @@ export function planOrder(order, settings, context = {}) {
             cartLabel: `Kar ${cartIndex} van ${cartTotal}`,
             isFullCart,
             slipVariant: isFullCart ? "full_cart" : "partial_order",
-            barcodeEnabled,
+            barcodeEnabled: pickMode === "smallest",
             groupIdenticalCarts,
             cartsPerPrint: groupIdenticalCarts ? Math.max(1, num(docStep.packing_slip_carts_per_print, 1)) : null,
             splitIdenticalGroups: false,
         });
     }
     const stickerRelease = str(docStep.sticker_release, "with_pick_release");
-    const stickerAt = docRelease(stickerRelease, num(docStep.sticker_hours_before, 2));
+    // "Gelijk met de bijbehorende pakbon" volgt exact het vrijgavemoment van de pakbon.
+    const stickerAt = stickerRelease === "with_packing_slip"
+        ? packingAt
+        : docRelease(stickerRelease, num(docStep.sticker_hours_before, 2));
     add("print.sticker", stickerAt, stickerAt, {
         documentType: "sticker",
         release: stickerRelease,
-        pickStationId: str(docStep.sticker_station, "") || null,
+        // Gelijk met de pakbon = zelfde pickstation, voor elk pickstation gelijk.
+        pickStationId: stickerRelease === "with_packing_slip"
+            ? str(docStep.packing_slip_station, "") || null
+            : str(docStep.sticker_station, "") || null,
+        printsWithPackingSlip: stickerRelease === "with_packing_slip",
         requiresApproval: false,
     });
     const shippingRelease = str(docStep.shipping_note_release, "after_checkin");