@flowselections/floriday-verkoop-module 1.0.123 → 1.0.127

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
  2. package/dist-lib/components/verkoop/CreateOrderPage.js +3 -2
  3. package/dist-lib/lib/cart-replan.functions.d.ts +3 -58
  4. package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
  5. package/dist-lib/lib/cart-replan.functions.js +3 -364
  6. package/dist-lib/lib/cart-replan.server.d.ts +67 -0
  7. package/dist-lib/lib/cart-replan.server.d.ts.map +1 -0
  8. package/dist-lib/lib/cart-replan.server.js +367 -0
  9. package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
  10. package/dist-lib/lib/create-order.functions.js +20 -0
  11. package/dist-lib/lib/cron/salesorders-sync.server.d.ts +20 -0
  12. package/dist-lib/lib/cron/salesorders-sync.server.d.ts.map +1 -0
  13. package/dist-lib/lib/cron/salesorders-sync.server.js +104 -0
  14. package/dist-lib/lib/cron/sync-salesorders.js +1 -1
  15. package/dist-lib/lib/engine-wake.server.d.ts +4 -0
  16. package/dist-lib/lib/engine-wake.server.d.ts.map +1 -0
  17. package/dist-lib/lib/engine-wake.server.js +92 -0
  18. package/dist-lib/lib/floriday-mirror.functions.d.ts +1 -19
  19. package/dist-lib/lib/floriday-mirror.functions.d.ts.map +1 -1
  20. package/dist-lib/lib/floriday-mirror.functions.js +6 -1475
  21. package/dist-lib/lib/floriday-mirror.server.d.ts +20 -0
  22. package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -0
  23. package/dist-lib/lib/floriday-mirror.server.js +1475 -0
  24. package/dist-lib/lib/list-speed.check.d.ts +2 -0
  25. package/dist-lib/lib/list-speed.check.d.ts.map +1 -0
  26. package/dist-lib/lib/list-speed.check.js +49 -0
  27. package/dist-lib/lib/module-version.d.ts +1 -1
  28. package/dist-lib/lib/module-version.js +1 -1
  29. package/dist-lib/lib/order-backlog.server.d.ts.map +1 -1
  30. package/dist-lib/lib/order-backlog.server.js +48 -0
  31. package/dist-lib/lib/order-buffers.functions.d.ts +0 -2
  32. package/dist-lib/lib/order-buffers.functions.d.ts.map +1 -1
  33. package/dist-lib/lib/order-buffers.functions.js +0 -10
  34. package/dist-lib/lib/order-buffers.server.d.ts +3 -0
  35. package/dist-lib/lib/order-buffers.server.d.ts.map +1 -0
  36. package/dist-lib/lib/order-buffers.server.js +11 -0
  37. package/dist-lib/lib/order-cancel.server.d.ts +2 -0
  38. package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
  39. package/dist-lib/lib/order-cancel.server.js +7 -0
  40. package/dist-lib/lib/order-item-packing.functions.js +1 -1
  41. package/dist-lib/lib/salesorders-list.functions.d.ts +1 -0
  42. package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
  43. package/dist-lib/lib/salesorders-list.functions.js +25 -2
  44. package/dist-lib/lib/salesorders-list.server.d.ts +20 -0
  45. package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
  46. package/dist-lib/lib/salesorders-list.server.js +421 -268
  47. package/dist-lib/lib/salesorders.functions.d.ts +0 -14
  48. package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
  49. package/dist-lib/lib/salesorders.functions.js +4 -102
  50. package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
  51. package/dist-lib/lib/useSalesOrdersQuery.js +12 -2
  52. package/package.json +3 -2
@@ -1 +1 @@
1
- {"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAkGA,wBAAgB,eAAe,gCAqiC9B"}
1
+ {"version":3,"file":"CreateOrderPage.d.ts","sourceRoot":"","sources":["../../../src/components/verkoop/CreateOrderPage.tsx"],"names":[],"mappings":"AAkGA,wBAAgB,eAAe,gCAsiC9B"}
@@ -475,8 +475,9 @@ export function CreateOrderPage() {
475
475
  ? `Twinfield ${c.twinfield_code}${c.email ? ` · ${c.email}` : ""}`
476
476
  : (c.email ?? undefined),
477
477
  })), onChange: (v) => { void handleSelectCustomer(v); }, allowClear: false })] }), _jsxs("div", { className: "space-y-1", children: [_jsxs(Label, { className: "flex items-center gap-2", children: ["Afleverlocatie ", _jsx("span", { className: "text-destructive", children: "*" })] }), _jsx(SearchableSelect, { value: deliveryLocationId, placeholder: !customerId ? "Selecteer eerst een klant"
478
- : deliveryLocations.length ? "Kies locatie..."
479
- : "Geen locaties bekend voor deze klant", disabled: !customerId || deliveryLocations.length === 0, allowClear: false, options: deliveryLocations.map((l) => {
478
+ : deliveryLocQ.isFetching && deliveryLocations.length === 0 ? "Laden…"
479
+ : deliveryLocations.length ? "Kies locatie..."
480
+ : "Geen locaties bekend voor deze klant", disabled: !customerId || deliveryLocations.length === 0, allowClear: false, options: deliveryLocations.map((l) => {
480
481
  const addr = [
481
482
  l.address_line || [l.street, l.house_number].filter(Boolean).join(" "),
482
483
  l.postal_code, l.city,
@@ -1,49 +1,4 @@
1
- export interface BlockedItem {
2
- order_item_id: string;
3
- order_id: string | null;
4
- product_name: string;
5
- reason: "geen_belading" | "onvolledige_belading";
6
- missing: string[];
7
- }
8
- export declare function replanBufferInternal(bufferId: string): Promise<{
9
- ok: boolean;
10
- bufferId: string | null;
11
- orderIds: string[];
12
- cartsCreated: number;
13
- replacedManualCount: number;
14
- usedFloridayPacking: boolean;
15
- warnings: string[];
16
- blockedItems: BlockedItem[];
17
- skipped?: "locked";
18
- }>;
19
- /**
20
- * Plant karren voor een scope: een Engine-buffer (bufferId) óf één losse order
21
- * (orderId) wanneer de Engine zegt dat er niet gebufferd wordt.
22
- */
23
- export declare function replanScopeInternal(scope: {
24
- bufferId?: string | null;
25
- orderId?: string | null;
26
- }): Promise<{
27
- ok: boolean;
28
- bufferId: string | null;
29
- orderIds: string[];
30
- cartsCreated: number;
31
- replacedManualCount: number;
32
- usedFloridayPacking: boolean;
33
- warnings: string[];
34
- blockedItems: BlockedItem[];
35
- skipped?: "locked";
36
- }>;
37
- export declare function replanOrderCartsFromCron(orderId: string): Promise<{
38
- ok: boolean;
39
- orderId: string;
40
- cartsCreated: number;
41
- replacedManualCount: number;
42
- usedFloridayPacking: boolean;
43
- warnings: string[];
44
- blockedItems: BlockedItem[];
45
- skipped?: "locked";
46
- }>;
1
+ export type { BlockedItem } from "./cart-replan.server.js";
47
2
  export declare const replanOrderCarts: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
48
3
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
49
4
  userId: string;
@@ -57,19 +12,9 @@ export declare const replanOrderCarts: import("@tanstack/start-client-core").Opt
57
12
  replacedManualCount: number;
58
13
  usedFloridayPacking: boolean;
59
14
  warnings: string[];
60
- blockedItems: BlockedItem[];
15
+ blockedItems: import("./cart-replan.server.js").BlockedItem[];
61
16
  skipped?: "locked";
62
17
  }>>;
63
- export declare function drainCartReplanQueue(_limit?: number): Promise<{
64
- ok: boolean;
65
- processed: number;
66
- failed: number;
67
- results: Array<{
68
- orderId: string;
69
- ok: boolean;
70
- error?: string;
71
- }>;
72
- }>;
73
18
  export declare const getOrderPlanCoverage: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
74
19
  supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
75
20
  userId: string;
@@ -99,7 +44,7 @@ export declare const replanBufferForOrder: import("@tanstack/start-client-core")
99
44
  replacedManualCount: number;
100
45
  usedFloridayPacking: boolean;
101
46
  warnings: string[];
102
- blockedItems: BlockedItem[];
47
+ blockedItems: import("./cart-replan.server.js").BlockedItem[];
103
48
  skipped?: "locked";
104
49
  }>>;
105
50
  //# sourceMappingURL=cart-replan.functions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cart-replan.functions.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.functions.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,GAAG,sBAAsB,CAAC;IACjD,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM;QAYrD,OAAO;cACD,MAAM,GAAG,IAAI;cACb,MAAM,EAAE;kBACJ,MAAM;yBACC,MAAM;yBACN,OAAO;cAClB,MAAM,EAAE;kBACJ,WAAW,EAAE;cACjB,QAAQ;GAlBnB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE;IAC/C,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC,CA+YD;AA4BD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,MAAM;QAzBxD,OAAO;aACF,MAAM;kBACD,MAAM;yBACC,MAAM;yBACN,OAAO;cAClB,MAAM,EAAE;kBACJ,WAAW,EAAE;cACjB,QAAQ;GAoBnB;AAED,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;QA/B3B,OAAO;aACF,MAAM;kBACD,MAAM;yBACC,MAAM;yBACN,OAAO;cAClB,MAAM,EAAE;kBACJ,WAAW,EAAE;cACjB,QAAQ;GA6BhB,CAAC;AAML,wBAAsB,oBAAoB,CAAC,MAAM,SAAK,GAAG,OAAO,CAAC;IAC/D,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClE,CAAC,CAED;AAMD,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;gBAUA,MAAM,GAAG,IAAI;eAAS,MAAM,GAAG,IAAI;mBAAa,MAAM,GAAG,IAAI;;GAsB1F,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;QAxf3B,OAAO;cACD,MAAM,GAAG,IAAI;cACb,MAAM,EAAE;kBACJ,MAAM;yBACC,MAAM;yBACN,OAAO;cAClB,MAAM,EAAE;kBACJ,WAAW,EAAE;cACjB,QAAQ;GAsfhB,CAAC"}
1
+ {"version":3,"file":"cart-replan.functions.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.functions.ts"],"names":[],"mappings":"AASA,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,eAAO,MAAM,gBAAgB;;;;8CAEH,OAAO;;;;;;;;;;;GAM7B,CAAC;AAML,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;gBAUA,MAAM,GAAG,IAAI;eAAS,MAAM,GAAG,IAAI;mBAAa,MAAM,GAAG,IAAI;;GAsB1F,CAAC;AAEL,eAAO,MAAM,oBAAoB;;;;8CAEP,OAAO;;;;;;;;;;;;GAQ7B,CAAC"}
@@ -4,381 +4,18 @@
4
4
  // - handmatige "Herbereken" knop in de order-detail
5
5
  // - cron endpoint /api/public/cron/replan-carts (drain van cart_replan_queue)
6
6
  import { createServerFn } from "@tanstack/react-start";
7
- import { productNameForStorage } from "./product-name.js";
8
7
  import { z } from "zod";
9
8
  import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
10
9
  import { resolveOrderRow } from "./order-row.server.js";
11
- import { CART_PLANNER_VERSION, planCarts, } from "./cart-planner.js";
12
- import { resolveBufferForOrderInternal } from "./order-buffers.functions.js";
13
- export async function replanBufferInternal(bufferId) {
14
- return replanScopeInternal({ bufferId });
15
- }
16
- /**
17
- * Plant karren voor een scope: een Engine-buffer (bufferId) óf één losse order
18
- * (orderId) wanneer de Engine zegt dat er niet gebufferd wordt.
19
- */
20
- export async function replanScopeInternal(scope) {
21
- const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
22
- const bufferId = scope.bufferId ?? null;
23
- const soloOrderId = bufferId ? null : (scope.orderId ?? null);
24
- if (!bufferId && !soloOrderId)
25
- throw new Error("replanScopeInternal: geen scope");
26
- let ordersQuery = supabaseAdmin
27
- .from("orders")
28
- .select("id, order_number, custom_fields, plan_locked_at")
29
- .is("deleted_at", null);
30
- ordersQuery = bufferId
31
- ? ordersQuery.eq("buffer_id", bufferId)
32
- : ordersQuery.eq("id", soloOrderId);
33
- const { data: orders } = await ordersQuery;
34
- const orderRows = (orders ?? []);
35
- const orderIds = orderRows.map((o) => o.id);
36
- const orderNumberById = new Map();
37
- for (const o of orderRows) {
38
- if (o.order_number)
39
- orderNumberById.set(o.id, String(o.order_number));
40
- }
41
- if (orderRows.some((o) => o.plan_locked_at)) {
42
- return {
43
- ok: true,
44
- bufferId,
45
- orderIds,
46
- cartsCreated: 0,
47
- replacedManualCount: 0,
48
- usedFloridayPacking: false,
49
- warnings: ["plan_locked"],
50
- blockedItems: [],
51
- skipped: "locked",
52
- };
53
- }
54
- // Items van alle orders in de buffer.
55
- const { data: items, error: itErr } = await supabaseAdmin
56
- .from("order_items")
57
- .select("id, order_id, product_id, product_name, quantity, plants_per_crate, crates_per_layer, layers_per_cart, products(plants_per_crate, crates_per_layer, layers_per_cart)")
58
- .in("order_id", orderIds.length > 0 ? orderIds : ["00000000-0000-0000-0000-000000000000"])
59
- .is("quarantined_at", null);
60
- if (itErr)
61
- throw new Error(itErr.message);
62
- // Onbekend blijft onbekend: geen ?? 1. De planner blokkeert regels
63
- // zonder (volledige) belading in plaats van 1×1×1 te plannen.
64
- const pos = (v) => {
65
- if (v === null || v === undefined)
66
- return null;
67
- const n = Number(v);
68
- return Number.isFinite(n) && n > 0 ? Math.round(n) : null;
69
- };
70
- /** Een bron telt alleen als álle drie de velden gevuld zijn (> 0). */
71
- const completeSource = (plants_per_crate, crates_per_layer, layers_per_cart) => {
72
- const a = pos(plants_per_crate);
73
- const b = pos(crates_per_layer);
74
- const c = pos(layers_per_cart);
75
- return a && b && c ? { plants_per_crate: a, crates_per_layer: b, layers_per_cart: c } : null;
76
- };
77
- // Beladingbron per order: custom_fields.floriday_packing bevat de belading
78
- // zoals die in Floriday op de order staat. Dat zijn de packing-VELDEN
79
- // (pieces_per_package / packages_per_layer / layers_per_load_carrier) —
80
- // géén voorgekauwde karrenlijst; de karindeling rekenen we zelf.
81
- const floridayByOrder = new Map();
82
- const loadCarrierByOrder = new Map();
83
- for (const o of orderRows) {
84
- const fp = (o.custom_fields ?? {})?.floriday_packing ?? null;
85
- if (!fp)
86
- continue;
87
- const bel = completeSource(fp.pieces_per_package, fp.packages_per_layer, fp.layers_per_load_carrier);
88
- if (bel)
89
- floridayByOrder.set(o.id, bel);
90
- const lc = typeof fp.load_carrier === "string" ? fp.load_carrier.trim() : "";
91
- if (lc)
92
- loadCarrierByOrder.set(o.id, lc.toUpperCase());
93
- }
94
- // ── Ladingdragerprofiel ────────────────────────────────────────────────
95
- // Vertrouw NIET op de kolomdefault 'trolley' van order_carts: die verbergt
96
- // dat er geen profielkeuze is gemaakt. Zonder profiel plannen we niet.
97
- const { data: carrierProfiles } = await supabaseAdmin
98
- .from("load_carrier_types")
99
- .select("id, code, name, layers_per_carrier, is_active, is_default");
100
- const activeProfiles = (carrierProfiles ?? []).filter((p) => p.is_active);
101
- const defaultProfile = activeProfiles.find((p) => p.is_default) ??
102
- activeProfiles.find((p) => String(p.code).toLowerCase() === "trolley") ??
103
- null;
104
- /** Floriday-ladingdragercode → code in load_carrier_types. */
105
- const CARRIER_CODE_MAP = {
106
- DANISH_TROLLEY: ["danish_container", "danish_trolley"],
107
- DANISH_TROLLEY_NON_CC_RFID: ["danish_container"],
108
- DANISH_TROLLEY_WATER_TRAY: ["danish_container"],
109
- ONE_THIRD_DANISH_TROLLEY: ["danish_container"],
110
- AUCTION_TROLLEY: ["auction_trolley", "trolley"],
111
- EURO_TROLLEY: ["euro_rolcontainer", "trolley"],
112
- ROLL_CONTAINER: ["euro_rolcontainer"],
113
- EURO_PALLET: ["euro_pallet", "pallet"],
114
- HT_EURO_PALLET: ["euro_pallet", "pallet"],
115
- PALLET: ["pallet"],
116
- BLOCK_PALLET: ["pallet"],
117
- NONE: ["loose"],
118
- };
119
- const profileFor = (loadCarrier) => {
120
- if (!loadCarrier)
121
- return defaultProfile;
122
- const direct = activeProfiles.find((p) => String(p.code).toUpperCase() === loadCarrier.toUpperCase());
123
- if (direct)
124
- return direct;
125
- for (const code of CARRIER_CODE_MAP[loadCarrier.toUpperCase()] ?? []) {
126
- const hit = activeProfiles.find((p) => String(p.code).toLowerCase() === code);
127
- if (hit)
128
- return hit;
129
- }
130
- return defaultProfile;
131
- };
132
- let usedFloridayPacking = false;
133
- const inputs = (items ?? []).map((it) => {
134
- const prod = it.products ?? {};
135
- // Volgorde: orderregel → floriday_packing → product. Niet coalescen per
136
- // veld: een half-Floriday/half-orderregel-belading is geen belading.
137
- const fromFloriday = floridayByOrder.get(it.order_id) ?? null;
138
- const orderLineBel = completeSource(it.plants_per_crate, it.crates_per_layer, it.layers_per_cart);
139
- const bel = orderLineBel ??
140
- fromFloriday ??
141
- completeSource(prod.plants_per_crate, prod.crates_per_layer, prod.layers_per_cart);
142
- if (orderLineBel == null && fromFloriday != null)
143
- usedFloridayPacking = true;
144
- const loadCarrier = loadCarrierByOrder.get(it.order_id) ?? null;
145
- // layers_per_cart = LEAST(profiel, bron) — identiek aan logistics_plan_buffer_sql.
146
- const profileLayers = pos(profileFor(loadCarrier)?.layers_per_carrier);
147
- const layers = bel?.layers_per_cart != null && profileLayers != null
148
- ? Math.min(bel.layers_per_cart, profileLayers)
149
- : (bel?.layers_per_cart ?? null);
150
- return {
151
- order_item_id: it.id,
152
- product_id: it.product_id,
153
- product_name: productNameForStorage(it.product_name),
154
- plants: Math.max(0, Number(it.quantity ?? 0)),
155
- plants_per_crate: bel?.plants_per_crate ?? null,
156
- crates_per_layer: bel?.crates_per_layer ?? null,
157
- layers_per_cart: layers,
158
- load_carrier: loadCarrier,
159
- };
160
- });
161
- // Item → order-map voor het toewijzen van cart.order_id bij homogene karren.
162
- const itemToOrder = new Map();
163
- for (const it of items ?? []) {
164
- itemToOrder.set(it.id, it.order_id);
165
- }
166
- // Nummering én delete-scope liggen altijd op bufferniveau als de order een
167
- // buffer heeft; order-scope is uitsluitend terugval. Wissen én wegschrijven
168
- // gebeuren verderop in ÉÉN transactie via public.replace_order_carts, zodat
169
- // een mislukte replan de bestaande indeling laat staan.
170
- if (!bufferId) {
171
- console.warn("[cart-replan] geen buffer voor order %s — nummering en delete vallen terug op order-scope", soloOrderId);
172
- }
173
- let replacedManualCount = 0;
174
- // De karindeling wordt hier altijd zelf gerekend. custom_fields.floriday_packing
175
- // levert alleen de belading-VELDEN (pieces_per_package / packages_per_layer /
176
- // layers_per_load_carrier) — de mirror schrijft nooit een voorgekauwde
177
- // carts-array, dus die tak bestaat bewust niet meer.
178
- const plannedCarts = [];
179
- const warnings = [];
180
- let blockedItems = [];
181
- {
182
- const [{ data: settings }, { data: overrides }] = await Promise.all([
183
- supabaseAdmin.from("cart_planning_settings").select("*").eq("id", 1).maybeSingle(),
184
- supabaseAdmin.from("cart_planning_product_overrides").select("product_id, never_mix"),
185
- ]);
186
- const neverMix = new Set((overrides ?? [])
187
- .filter((o) => o.never_mix && o.product_id)
188
- .map((o) => o.product_id));
189
- // Ladingdrager is een HARDE partitie: één planner-run per load_carrier.
190
- // Items zonder load_carrier (lokale orders) vormen hun eigen partitie op
191
- // het defaultprofiel.
192
- const partitions = new Map();
193
- for (const input of inputs) {
194
- const key = input.load_carrier ?? "";
195
- const list = partitions.get(key);
196
- if (list)
197
- list.push(input);
198
- else
199
- partitions.set(key, [input]);
200
- }
201
- const allBlocked = [];
202
- let nextCartNumber = 1;
203
- for (const [key, partitionInputs] of partitions) {
204
- const profile = profileFor(key || null);
205
- if (!profile) {
206
- // Geen actief profiel én geen 'trolley': niet plannen, wel blokkeren.
207
- for (const i of partitionInputs) {
208
- allBlocked.push({
209
- order_item_id: i.order_item_id,
210
- product_id: i.product_id,
211
- product_name: productNameForStorage(i.product_name),
212
- reason: "geen_belading",
213
- missing: ["load_carrier_profile"],
214
- });
215
- }
216
- warnings.push(`Geen actief ladingdragerprofiel gevonden${key ? ` voor ${key}` : ""} — karindeling overgeslagen.`);
217
- continue;
218
- }
219
- const result = planCarts(partitionInputs, {
220
- maxPartySharePerLayerPct: settings?.max_party_share_per_layer_pct ?? 50,
221
- maxBeladingenPerLayer: settings?.max_beladingen_per_layer ?? 2,
222
- neverMixProductIds: neverMix,
223
- startCartNumber: nextCartNumber,
224
- });
225
- for (const cart of result.carts) {
226
- nextCartNumber = Math.max(nextCartNumber, cart.cart_number + 1);
227
- plannedCarts.push({ cart, profile });
228
- }
229
- warnings.push(...result.warnings);
230
- allBlocked.push(...result.blocked);
231
- }
232
- const result = { blocked: allBlocked };
233
- // Regels zonder (volledige) belading: NOOIT karren maken. Meld de
234
- // blokkade aan de logistiek-engine zodat die zichtbaar wordt in
235
- // logistics_plan_queue / logistics_events / logistics_decisions.
236
- if (result.blocked.length > 0) {
237
- const blockedOrderIds = [
238
- ...new Set(result.blocked
239
- .map((b) => itemToOrder.get(b.order_item_id))
240
- .filter((v) => !!v)),
241
- ];
242
- blockedItems = result.blocked.map((b) => ({
243
- order_item_id: b.order_item_id,
244
- order_id: itemToOrder.get(b.order_item_id) ?? null,
245
- product_name: productNameForStorage(b.product_name),
246
- reason: b.reason,
247
- missing: b.missing,
248
- }));
249
- if (blockedOrderIds.length > 0) {
250
- const FIELD_LABELS = {
251
- plants_per_crate: "planten per fust",
252
- crates_per_layer: "fusten per laag",
253
- layers_per_cart: "lagen per kar",
254
- };
255
- const nummers = blockedOrderIds
256
- .map((id) => orderNumberById.get(id) ?? id.slice(0, 8))
257
- .join(", ");
258
- const velden = [
259
- ...new Set(blockedItems.flatMap((b) => b.missing)),
260
- ]
261
- .map((f) => FIELD_LABELS[f] ?? f)
262
- .join(", ");
263
- const reason = `Karindeling geblokkeerd voor order(s) ${nummers}: ` +
264
- `${blockedItems.length} orderregel(s) zonder volledige belading` +
265
- (velden ? ` (ontbreekt: ${velden})` : "") + ".";
266
- // Geen eigen blokkade of mail meer (koppelprompt 22): de Engine
267
- // beslist zelf en meldt een definitieve blokkade.
268
- warnings.push(reason);
269
- }
270
- }
271
- }
272
- // Payload voor public.replace_order_carts. LET OP: de sleutels hieronder
273
- // moeten gelijk lopen met de sleutellijsten in die SQL-functie; ontbreekt er
274
- // één, dan gooit de database een fout in plaats van stil NULL te schrijven.
275
- const cartPayload = plannedCarts.map(({ cart, profile }) => {
276
- // Bepaal cart.order_id: null bij mix van orders, anders die ene order.
277
- const orderIdsOnCart = new Set();
278
- for (const i of cart.items) {
279
- const oid = itemToOrder.get(i.order_item_id);
280
- if (oid)
281
- orderIdsOnCart.add(oid);
282
- }
283
- const singleOrderId = orderIdsOnCart.size === 1 ? [...orderIdsOnCart][0] : null;
284
- return {
285
- order_id: singleOrderId,
286
- buffer_id: bufferId,
287
- cart_number: cart.cart_number,
288
- is_auto: true,
289
- is_complete: cart.is_complete,
290
- source: usedFloridayPacking ? "floriday" : "auto",
291
- occupancy_pct: cart.occupancy_pct,
292
- total_layers_used: cart.total_layers_used,
293
- // Profiel expliciet meegeven; nooit leunen op de kolomdefault.
294
- carrier_type: profile.code,
295
- carrier_type_id: profile.id,
296
- max_layers: profile.layers_per_carrier ?? null,
297
- algorithm_version: CART_PLANNER_VERSION,
298
- items: cart.items.map((i) => ({
299
- order_item_id: i.order_item_id,
300
- product_id: i.product_id,
301
- product_name: productNameForStorage(i.product_name),
302
- crates: Math.max(1, Math.round(i.crates)),
303
- plants_per_crate: i.plants_per_crate,
304
- crates_per_layer: i.crates_per_layer,
305
- layers_per_cart: i.layers_per_cart,
306
- layer_fraction: i.layer_fraction,
307
- layer_share_pct: i.layer_share_pct,
308
- })),
309
- };
310
- });
311
- // Delete + inserts in één transactie: faalt er iets, dan blijft de oude
312
- // karindeling staan in plaats van een lege buffer achter te laten.
313
- const { data: replaceRes, error: replaceErr } = await supabaseAdmin.rpc("replace_order_carts", {
314
- p_buffer_id: bufferId,
315
- p_order_id: bufferId ? null : soloOrderId,
316
- p_carts: cartPayload,
317
- });
318
- if (replaceErr)
319
- throw new Error(replaceErr.message);
320
- const cartsCreated = Number(replaceRes?.carts_written ?? 0);
321
- const itemsWritten = Number(replaceRes?.items_written ?? 0);
322
- replacedManualCount = Number(replaceRes?.replaced_manual_count ?? 0);
323
- // Controleer dat de database daadwerkelijk heeft weggeschreven wat de
324
- // planner opleverde. Nul karren mag, maar alleen als de planner er ook nul
325
- // opleverde — niet als gevolg van een fout.
326
- const expectedItems = cartPayload.reduce((n, c) => n + c.items.length, 0);
327
- if (cartsCreated !== cartPayload.length || itemsWritten !== expectedItems) {
328
- throw new Error(`Karindeling niet volledig weggeschreven: ${cartsCreated}/${cartPayload.length} karren, ` +
329
- `${itemsWritten}/${expectedItems} artikelen.`);
330
- }
331
- // Weer ingedeeld: eerdere blokkademeldingen wissen, zodat een latere
332
- // blokkade opnieuw gemaild mag worden.
333
- if (cartsCreated > 0) {
334
- const plannedOrderIds = Array.from(new Set(Array.from(itemToOrder.values()).filter((v) => !!v)));
335
- const { clearOrderBlockNotifications } = await import("./order-block-mail.server.js");
336
- await clearOrderBlockNotifications(plannedOrderIds);
337
- }
338
- return {
339
- ok: true,
340
- bufferId,
341
- orderIds,
342
- cartsCreated,
343
- replacedManualCount,
344
- usedFloridayPacking,
345
- warnings,
346
- blockedItems,
347
- };
348
- }
349
- async function replanOrderInternal(orderId) {
350
- // Vraag het bufferbesluit aan de Engine en plan die scope opnieuw.
351
- const bufferId = await resolveBufferForOrderInternal(orderId);
352
- const res = await replanScopeInternal({ bufferId, orderId });
353
- return {
354
- ok: res.ok,
355
- orderId,
356
- cartsCreated: res.cartsCreated,
357
- replacedManualCount: res.replacedManualCount,
358
- usedFloridayPacking: res.usedFloridayPacking,
359
- warnings: res.warnings,
360
- blockedItems: res.blockedItems,
361
- skipped: res.skipped,
362
- };
363
- }
364
- export async function replanOrderCartsFromCron(orderId) {
365
- return replanOrderInternal(orderId);
366
- }
367
10
  export const replanOrderCarts = createServerFn({ method: "POST" })
368
11
  .middleware([requireSupabaseAuth])
369
12
  .inputValidator((input) => z.object({ orderId: z.string().min(1) }).parse(input))
370
13
  .handler(async ({ data, context }) => {
371
14
  // DTO-id kan een Floriday salesOrderId zijn.
372
15
  const order = await resolveOrderRow(context.supabase, data.orderId);
16
+ const { replanOrderInternal } = await import("./cart-replan.server.js");
373
17
  return replanOrderInternal(order.id);
374
18
  });
375
- // ─── Queue drain (aangeroepen door pg_cron elke minuut) ─────────────────────
376
- // Karplanning is eigendom van de Logistiek Engine (runCartPlanRequests draait
377
- // daar elke minuut). Deze drain is bewust geneutraliseerd zodat de Verkoop-
378
- // module nooit zelf een indeelronde start.
379
- export async function drainCartReplanQueue(_limit = 50) {
380
- return { ok: true, processed: 0, failed: 0, results: [] };
381
- }
382
19
  // ─── Lezen — voor de UI ─────────────────────────────────────────────────────
383
20
  // De karindeling van een order komt uitsluitend uit de Logistiek Engine
384
21
  // (logistics_order_plan_coverage). Deze module leest order_carts/
@@ -425,6 +62,8 @@ export const replanBufferForOrder = createServerFn({ method: "POST" })
425
62
  .handler(async ({ data, context }) => {
426
63
  // DTO-id kan een Floriday salesOrderId zijn.
427
64
  const order = await resolveOrderRow(context.supabase, data.orderId);
65
+ const { resolveBufferForOrderInternal } = await import("./order-buffers.server.js");
66
+ const { replanScopeInternal } = await import("./cart-replan.server.js");
428
67
  const bufferId = await resolveBufferForOrderInternal(order.id);
429
68
  return replanScopeInternal({ bufferId, orderId: order.id });
430
69
  });
@@ -0,0 +1,67 @@
1
+ export interface BlockedItem {
2
+ order_item_id: string;
3
+ order_id: string | null;
4
+ product_name: string;
5
+ reason: "geen_belading" | "onvolledige_belading";
6
+ missing: string[];
7
+ }
8
+ export declare function replanBufferInternal(bufferId: string): Promise<{
9
+ ok: boolean;
10
+ bufferId: string | null;
11
+ orderIds: string[];
12
+ cartsCreated: number;
13
+ replacedManualCount: number;
14
+ usedFloridayPacking: boolean;
15
+ warnings: string[];
16
+ blockedItems: BlockedItem[];
17
+ skipped?: "locked";
18
+ }>;
19
+ /**
20
+ * Plant karren voor een scope: een Engine-buffer (bufferId) óf één losse order
21
+ * (orderId) wanneer de Engine zegt dat er niet gebufferd wordt.
22
+ */
23
+ export declare function replanScopeInternal(scope: {
24
+ bufferId?: string | null;
25
+ orderId?: string | null;
26
+ }): Promise<{
27
+ ok: boolean;
28
+ bufferId: string | null;
29
+ orderIds: string[];
30
+ cartsCreated: number;
31
+ replacedManualCount: number;
32
+ usedFloridayPacking: boolean;
33
+ warnings: string[];
34
+ blockedItems: BlockedItem[];
35
+ skipped?: "locked";
36
+ }>;
37
+ export declare function replanOrderInternal(orderId: string): Promise<{
38
+ ok: boolean;
39
+ orderId: string;
40
+ cartsCreated: number;
41
+ replacedManualCount: number;
42
+ usedFloridayPacking: boolean;
43
+ warnings: string[];
44
+ blockedItems: BlockedItem[];
45
+ skipped?: "locked";
46
+ }>;
47
+ export declare function replanOrderCartsFromCron(orderId: string): Promise<{
48
+ ok: boolean;
49
+ orderId: string;
50
+ cartsCreated: number;
51
+ replacedManualCount: number;
52
+ usedFloridayPacking: boolean;
53
+ warnings: string[];
54
+ blockedItems: BlockedItem[];
55
+ skipped?: "locked";
56
+ }>;
57
+ export declare function drainCartReplanQueue(_limit?: number): Promise<{
58
+ ok: boolean;
59
+ processed: number;
60
+ failed: number;
61
+ results: Array<{
62
+ orderId: string;
63
+ ok: boolean;
64
+ error?: string;
65
+ }>;
66
+ }>;
67
+ //# sourceMappingURL=cart-replan.server.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cart-replan.server.d.ts","sourceRoot":"","sources":["../../src/lib/cart-replan.server.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,GAAG,sBAAsB,CAAC;IACjD,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM;QAYrD,OAAO;cACD,MAAM,GAAG,IAAI;cACb,MAAM,EAAE;kBACJ,MAAM;yBACC,MAAM;yBACN,OAAO;cAClB,MAAM,EAAE;kBACJ,WAAW,EAAE;cACjB,QAAQ;GAlBnB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE;IAC/C,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,GAAG,OAAO,CAAC;IACV,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC,CA+YD;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC,CAeD;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,MAAM;QAzBxD,OAAO;aACF,MAAM;kBACD,MAAM;yBACC,MAAM;yBACN,OAAO;cAClB,MAAM,EAAE;kBACJ,WAAW,EAAE;cACjB,QAAQ;GAoBnB;AAMD,wBAAsB,oBAAoB,CAAC,MAAM,SAAK,GAAG,OAAO,CAAC;IAC/D,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClE,CAAC,CAED"}