@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.
- package/dist-lib/components/verkoop/CreateOrderPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/CreateOrderPage.js +3 -2
- package/dist-lib/lib/cart-replan.functions.d.ts +3 -58
- package/dist-lib/lib/cart-replan.functions.d.ts.map +1 -1
- package/dist-lib/lib/cart-replan.functions.js +3 -364
- package/dist-lib/lib/cart-replan.server.d.ts +67 -0
- package/dist-lib/lib/cart-replan.server.d.ts.map +1 -0
- package/dist-lib/lib/cart-replan.server.js +367 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +20 -0
- package/dist-lib/lib/cron/salesorders-sync.server.d.ts +20 -0
- package/dist-lib/lib/cron/salesorders-sync.server.d.ts.map +1 -0
- package/dist-lib/lib/cron/salesorders-sync.server.js +104 -0
- package/dist-lib/lib/cron/sync-salesorders.js +1 -1
- package/dist-lib/lib/engine-wake.server.d.ts +4 -0
- package/dist-lib/lib/engine-wake.server.d.ts.map +1 -0
- package/dist-lib/lib/engine-wake.server.js +92 -0
- package/dist-lib/lib/floriday-mirror.functions.d.ts +1 -19
- package/dist-lib/lib/floriday-mirror.functions.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.functions.js +6 -1475
- package/dist-lib/lib/floriday-mirror.server.d.ts +20 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -0
- package/dist-lib/lib/floriday-mirror.server.js +1475 -0
- package/dist-lib/lib/list-speed.check.d.ts +2 -0
- package/dist-lib/lib/list-speed.check.d.ts.map +1 -0
- package/dist-lib/lib/list-speed.check.js +49 -0
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-backlog.server.d.ts.map +1 -1
- package/dist-lib/lib/order-backlog.server.js +48 -0
- package/dist-lib/lib/order-buffers.functions.d.ts +0 -2
- package/dist-lib/lib/order-buffers.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-buffers.functions.js +0 -10
- package/dist-lib/lib/order-buffers.server.d.ts +3 -0
- package/dist-lib/lib/order-buffers.server.d.ts.map +1 -0
- package/dist-lib/lib/order-buffers.server.js +11 -0
- package/dist-lib/lib/order-cancel.server.d.ts +2 -0
- package/dist-lib/lib/order-cancel.server.d.ts.map +1 -1
- package/dist-lib/lib/order-cancel.server.js +7 -0
- package/dist-lib/lib/order-item-packing.functions.js +1 -1
- package/dist-lib/lib/salesorders-list.functions.d.ts +1 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +25 -2
- package/dist-lib/lib/salesorders-list.server.d.ts +20 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +421 -268
- package/dist-lib/lib/salesorders.functions.d.ts +0 -14
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +4 -102
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +12 -2
- package/package.json +3 -2
|
@@ -108,8 +108,107 @@ async function chunked(ids, size, fn) {
|
|
|
108
108
|
}
|
|
109
109
|
return out;
|
|
110
110
|
}
|
|
111
|
-
|
|
111
|
+
// 10 minuten per serverproces (dus per shell: elke shell heeft een eigen
|
|
112
|
+
// deploy). Realtime-seintjes in de lijst sturen refreshReference mee.
|
|
113
|
+
const TTL_MS = 10 * 60 * 1000;
|
|
112
114
|
let crateDescCache = null;
|
|
115
|
+
let carrierNamesCache = null;
|
|
116
|
+
export function invalidateReferenceCache() {
|
|
117
|
+
crateDescCache = null;
|
|
118
|
+
carrierNamesCache = null;
|
|
119
|
+
groupPackingCache = null;
|
|
120
|
+
}
|
|
121
|
+
async function loadCarrierNames(supabase) {
|
|
122
|
+
if (carrierNamesCache && Date.now() - carrierNamesCache.at < TTL_MS)
|
|
123
|
+
return carrierNamesCache.value;
|
|
124
|
+
const map = new Map();
|
|
125
|
+
try {
|
|
126
|
+
const { data, error } = await supabase.from("carriers").select("id, name").limit(2000);
|
|
127
|
+
if (error)
|
|
128
|
+
throw new Error(error.message);
|
|
129
|
+
for (const c of (data ?? []))
|
|
130
|
+
map.set(String(c.id), String(c.name ?? ""));
|
|
131
|
+
carrierNamesCache = { at: Date.now(), value: map };
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
/* vervoerdernamen zijn optioneel */
|
|
135
|
+
if (carrierNamesCache)
|
|
136
|
+
return carrierNamesCache.value;
|
|
137
|
+
}
|
|
138
|
+
return map;
|
|
139
|
+
}
|
|
140
|
+
function makeTimer() {
|
|
141
|
+
const start = Date.now();
|
|
142
|
+
let last = start;
|
|
143
|
+
const steps = [];
|
|
144
|
+
const db = { n: 0 };
|
|
145
|
+
return {
|
|
146
|
+
db,
|
|
147
|
+
mark(step) {
|
|
148
|
+
const now = Date.now();
|
|
149
|
+
steps.push({ step, ms: now - last });
|
|
150
|
+
last = now;
|
|
151
|
+
},
|
|
152
|
+
async time(step, fn) {
|
|
153
|
+
const s = Date.now();
|
|
154
|
+
try {
|
|
155
|
+
return await fn();
|
|
156
|
+
}
|
|
157
|
+
finally {
|
|
158
|
+
steps.push({ step: ` ${step}`, ms: Date.now() - s });
|
|
159
|
+
}
|
|
160
|
+
},
|
|
161
|
+
done(kind) {
|
|
162
|
+
const totalMs = Date.now() - start;
|
|
163
|
+
const timing = { kind, totalMs, dbCalls: db.n, steps };
|
|
164
|
+
console.log(`[salesorders-list] ${kind} totaal=${totalMs}ms db=${db.n} ` +
|
|
165
|
+
steps.map((s) => `${s.step.trim()}=${s.ms}`).join(" "));
|
|
166
|
+
return timing;
|
|
167
|
+
},
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
/** Telt .from()/.rpc()-aanroepen; verder ongewijzigd doorgeven. */
|
|
171
|
+
function countingClient(sb, counter) {
|
|
172
|
+
if (sb.__counting)
|
|
173
|
+
return sb;
|
|
174
|
+
return new Proxy(sb, {
|
|
175
|
+
get(target, prop, receiver) {
|
|
176
|
+
if (prop === "__counting")
|
|
177
|
+
return true;
|
|
178
|
+
if (prop === "from" || prop === "rpc") {
|
|
179
|
+
return (...args) => {
|
|
180
|
+
counter.n++;
|
|
181
|
+
return target[prop](...args);
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
const v = Reflect.get(target, prop, receiver);
|
|
185
|
+
return typeof v === "function" ? v.bind(target) : v;
|
|
186
|
+
},
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
/** Venster voor logistics_order_overview uit de leverdatums van de rijen,
|
|
190
|
+
* met marge voor de pickdag. Ontbreekt een leverdatum: geen venster (null). */
|
|
191
|
+
export function overviewWindowFor(deliveries) {
|
|
192
|
+
let min = null;
|
|
193
|
+
let max = null;
|
|
194
|
+
for (const d of deliveries) {
|
|
195
|
+
const day = typeof d === "string" ? d.slice(0, 10) : "";
|
|
196
|
+
if (!/^\d{4}-\d{2}-\d{2}$/.test(day))
|
|
197
|
+
return { from: null, to: null };
|
|
198
|
+
if (!min || day < min)
|
|
199
|
+
min = day;
|
|
200
|
+
if (!max || day > max)
|
|
201
|
+
max = day;
|
|
202
|
+
}
|
|
203
|
+
if (!min || !max)
|
|
204
|
+
return { from: null, to: null };
|
|
205
|
+
const shift = (day, days) => {
|
|
206
|
+
const dt = new Date(`${day}T00:00:00Z`);
|
|
207
|
+
dt.setUTCDate(dt.getUTCDate() + days);
|
|
208
|
+
return dt.toISOString().slice(0, 10);
|
|
209
|
+
};
|
|
210
|
+
return { from: shift(min, -60), to: shift(max, 14) };
|
|
211
|
+
}
|
|
113
212
|
async function loadCrateDescriptions(supabase, warnings) {
|
|
114
213
|
if (crateDescCache && Date.now() - crateDescCache.at < TTL_MS)
|
|
115
214
|
return crateDescCache.value;
|
|
@@ -142,90 +241,95 @@ async function loadCrateDescriptions(supabase, warnings) {
|
|
|
142
241
|
// ── hoofdfunctie ──────────────────────────────────────────────────────────
|
|
143
242
|
export async function buildSalesOrdersList(supabase, params, connectionSupabase = supabase) {
|
|
144
243
|
const warnings = [];
|
|
244
|
+
const t = makeTimer();
|
|
245
|
+
// Teller van database-aanroepen per lading (meting).
|
|
246
|
+
supabase = countingClient(supabase, t.db);
|
|
247
|
+
connectionSupabase = countingClient(connectionSupabase, t.db);
|
|
248
|
+
if (params.refreshReference)
|
|
249
|
+
invalidateReferenceCache();
|
|
145
250
|
const pageSize = Math.min(PAGE_SIZE_MAX, Math.max(1, Math.floor(params.pageSize || 20)));
|
|
146
251
|
const page = Math.max(1, Math.floor(params.page || 1));
|
|
147
|
-
// 1) Actieve omgeving + connectie.
|
|
148
|
-
const envRes = await supabase
|
|
149
|
-
.from("floriday_settings")
|
|
150
|
-
.select("active_environment")
|
|
151
|
-
.eq("id", 1)
|
|
152
|
-
.maybeSingle();
|
|
153
|
-
const rawEnv = String(envRes.data?.active_environment ?? "staging");
|
|
154
|
-
const environment = rawEnv === "production" || rawEnv === "prod" || rawEnv === "live" ? "live" : "staging";
|
|
155
|
-
// De connectietabel bevat ook gevoelige velden en is daarom bewust niet
|
|
156
|
-
// rechtstreeks leesbaar voor browsers. Alleen deze veilige selectie loopt
|
|
157
|
-
// via de serverclient; alle orderdata blijft onder de rechten van de gebruiker.
|
|
158
|
-
const connRes = await connectionSupabase
|
|
159
|
-
.from("floriday_connections")
|
|
160
|
-
.select("id, organization_name, label")
|
|
161
|
-
.eq("is_active", true)
|
|
162
|
-
.eq("environment", environment)
|
|
163
|
-
.limit(1);
|
|
164
|
-
const conn = (connRes.data ?? [])[0];
|
|
165
|
-
const sellerFallback = conn?.organization_name ?? conn?.label ?? null;
|
|
166
|
-
let truncated = false;
|
|
167
|
-
// 2) Floriday-orders binnen het venster (alleen benodigde kolommen).
|
|
168
252
|
const dateColumn = params.dateField === "delivery"
|
|
169
253
|
? "data->delivery->>latestDeliveryDateTime"
|
|
170
254
|
: "data->>orderDateTime";
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
255
|
+
// 1 + 2) Omgeving, connectie en Floriday-orders — tegelijk met 3 (lokale orders).
|
|
256
|
+
const floridayTask = t.time("1_2_floriday", async () => {
|
|
257
|
+
const envRes = await supabase
|
|
258
|
+
.from("floriday_settings")
|
|
259
|
+
.select("active_environment")
|
|
260
|
+
.eq("id", 1)
|
|
261
|
+
.maybeSingle();
|
|
262
|
+
const rawEnv = String(envRes.data?.active_environment ?? "staging");
|
|
263
|
+
const environment = rawEnv === "production" || rawEnv === "prod" || rawEnv === "live" ? "live" : "staging";
|
|
264
|
+
// De connectietabel bevat ook gevoelige velden en is daarom bewust niet
|
|
265
|
+
// rechtstreeks leesbaar voor browsers. Alleen deze veilige selectie loopt
|
|
266
|
+
// via de serverclient; alle orderdata blijft onder de rechten van de gebruiker.
|
|
267
|
+
const connRes = await connectionSupabase
|
|
268
|
+
.from("floriday_connections")
|
|
269
|
+
.select("id, organization_name, label")
|
|
270
|
+
.eq("is_active", true)
|
|
271
|
+
.eq("environment", environment)
|
|
272
|
+
.limit(1);
|
|
273
|
+
const conn = (connRes.data ?? [])[0];
|
|
274
|
+
const sellerFallback = conn?.organization_name ?? conn?.label ?? null;
|
|
275
|
+
let truncated = false;
|
|
276
|
+
const foRows = [];
|
|
277
|
+
if (conn?.id && !params.localOrderId) {
|
|
278
|
+
const pageStep = 1000;
|
|
279
|
+
for (let from = 0; from < FO_CAP; from += pageStep) {
|
|
280
|
+
let q = supabase
|
|
281
|
+
.from("floriday_salesorders_cache")
|
|
282
|
+
.select("floriday_id, data, controlled_at")
|
|
283
|
+
.eq("connection_id", conn.id)
|
|
284
|
+
.eq("is_deleted", false)
|
|
285
|
+
.order("sequence_number", { ascending: false })
|
|
286
|
+
.range(from, from + pageStep - 1);
|
|
287
|
+
if (params.since)
|
|
288
|
+
q = q.gte(dateColumn, params.since);
|
|
289
|
+
if (params.until)
|
|
290
|
+
q = q.lt(dateColumn, params.until);
|
|
291
|
+
const { data, error } = await q;
|
|
292
|
+
if (error)
|
|
293
|
+
throw new Error(`Floriday-orders lezen faalde: ${error.message}`);
|
|
294
|
+
const batch = data ?? [];
|
|
295
|
+
foRows.push(...batch);
|
|
296
|
+
if (batch.length < pageStep)
|
|
297
|
+
break;
|
|
298
|
+
if (foRows.length >= FO_CAP)
|
|
299
|
+
truncated = true;
|
|
300
|
+
}
|
|
195
301
|
}
|
|
196
|
-
|
|
302
|
+
return { environment, sellerFallback, foRows, truncated };
|
|
303
|
+
});
|
|
197
304
|
// 3) Lokale orders binnen hetzelfde venster.
|
|
198
305
|
const localOrderSelect = "id, order_number, customer_name, customer_id, order_date, delivery_date, status, status_origin, status_changed_at, total, custom_fields, order_source, created_at, is_reservation, plan_locked_at, buffer_id, floriday_sales_order_id, floriday_order_group_key, order_items(id, product_id, product_name, source_line_key, quantity, unit, unit_price, quarantined_at, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
.from("orders")
|
|
203
|
-
.select(localOrderSelect)
|
|
204
|
-
.eq("id", params.localOrderId)
|
|
205
|
-
.is("deleted_at", null)
|
|
206
|
-
.maybeSingle();
|
|
207
|
-
if (primaryRes.error) {
|
|
208
|
-
throw new Error(`Lokale order lezen faalde: ${primaryRes.error.message}`);
|
|
209
|
-
}
|
|
210
|
-
const primaryRow = primaryRes.data;
|
|
211
|
-
if (primaryRow?.buffer_id) {
|
|
212
|
-
const bufferRes = await supabase
|
|
306
|
+
const localTask = t.time("3_lokaal", async () => {
|
|
307
|
+
if (params.localOrderId) {
|
|
308
|
+
const primaryRes = await supabase
|
|
213
309
|
.from("orders")
|
|
214
310
|
.select(localOrderSelect)
|
|
215
|
-
.eq("
|
|
311
|
+
.eq("id", params.localOrderId)
|
|
216
312
|
.is("deleted_at", null)
|
|
217
|
-
.
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
throw new Error(`Orderbuffer lezen faalde: ${bufferRes.error.message}`);
|
|
313
|
+
.maybeSingle();
|
|
314
|
+
if (primaryRes.error) {
|
|
315
|
+
throw new Error(`Lokale order lezen faalde: ${primaryRes.error.message}`);
|
|
221
316
|
}
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
317
|
+
const primaryRow = primaryRes.data;
|
|
318
|
+
if (primaryRow?.buffer_id) {
|
|
319
|
+
const bufferRes = await supabase
|
|
320
|
+
.from("orders")
|
|
321
|
+
.select(localOrderSelect)
|
|
322
|
+
.eq("buffer_id", primaryRow.buffer_id)
|
|
323
|
+
.is("deleted_at", null)
|
|
324
|
+
.order("created_at", { ascending: false })
|
|
325
|
+
.limit(200);
|
|
326
|
+
if (bufferRes.error) {
|
|
327
|
+
throw new Error(`Orderbuffer lezen faalde: ${bufferRes.error.message}`);
|
|
328
|
+
}
|
|
329
|
+
return (bufferRes.data ?? []);
|
|
330
|
+
}
|
|
331
|
+
return primaryRow ? [primaryRow] : [];
|
|
226
332
|
}
|
|
227
|
-
}
|
|
228
|
-
else {
|
|
229
333
|
let localQ = supabase
|
|
230
334
|
.from("orders")
|
|
231
335
|
.select(localOrderSelect)
|
|
@@ -245,41 +349,43 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
245
349
|
const localRes = await localQ;
|
|
246
350
|
if (localRes.error)
|
|
247
351
|
throw new Error(`Lokale orders lezen faalde: ${localRes.error.message}`);
|
|
248
|
-
|
|
249
|
-
}
|
|
352
|
+
return (localRes.data ?? []);
|
|
353
|
+
});
|
|
354
|
+
// Vervoerdernamen: vaste referentiedata, 10 min in het servergeheugen.
|
|
355
|
+
const carrierNamesTask = loadCarrierNames(supabase);
|
|
356
|
+
const [{ environment, sellerFallback, foRows, truncated }, localOrderRows] = await Promise.all([
|
|
357
|
+
floridayTask,
|
|
358
|
+
localTask,
|
|
359
|
+
]);
|
|
360
|
+
t.mark("1_3_bronnen");
|
|
250
361
|
// 3b) Vervoerders + verzendmomenten (best-effort, alleen voor deze orders).
|
|
251
|
-
|
|
362
|
+
// Loopt tegelijk met stap 5 (zie Promise.all hieronder).
|
|
363
|
+
const carrierNameById = await carrierNamesTask;
|
|
252
364
|
const shipmentStateByOrder = new Map();
|
|
253
|
-
try {
|
|
254
|
-
const { data: carrierRows } = await supabase.from("carriers").select("id, name").limit(2000);
|
|
255
|
-
for (const c of (carrierRows ?? []))
|
|
256
|
-
carrierNameById.set(String(c.id), String(c.name ?? ""));
|
|
257
|
-
}
|
|
258
|
-
catch {
|
|
259
|
-
/* vervoerdernamen zijn optioneel */
|
|
260
|
-
}
|
|
261
365
|
const localIds = localOrderRows.map((r) => String(r.id));
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
const
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
366
|
+
const shipmentsTask = t.time("3b_verzending", async () => {
|
|
367
|
+
if (localIds.length) {
|
|
368
|
+
try {
|
|
369
|
+
const { data: shipRows } = await supabase
|
|
370
|
+
.from("order_shipments")
|
|
371
|
+
.select("order_id, status, shipped_at")
|
|
372
|
+
.in("order_id", localIds.slice(0, 1000));
|
|
373
|
+
for (const s of (shipRows ?? [])) {
|
|
374
|
+
const key = String(s.order_id);
|
|
375
|
+
const prev = shipmentStateByOrder.get(key) ?? { shipped: false, picked: false };
|
|
376
|
+
const st = String(s.status ?? "").toLowerCase();
|
|
377
|
+
if (s.shipped_at || st === "verzonden" || st === "shipped")
|
|
378
|
+
prev.shipped = true;
|
|
379
|
+
if (st === "gepickt" || st === "picked" || st === "gecontroleerd")
|
|
380
|
+
prev.picked = true;
|
|
381
|
+
shipmentStateByOrder.set(key, prev);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
catch (e) {
|
|
385
|
+
warnings.push(`Verzendmomenten niet geladen: ${e.message}`);
|
|
277
386
|
}
|
|
278
387
|
}
|
|
279
|
-
|
|
280
|
-
warnings.push(`Verzendmomenten niet geladen: ${e.message}`);
|
|
281
|
-
}
|
|
282
|
-
}
|
|
388
|
+
});
|
|
283
389
|
// 4) Mailbox-voorstellen worden hier bewust NIET getoond: een voorstel is nog
|
|
284
390
|
// geen bestelling. Pas na bevestiging in de mailbox-module ontstaat er een
|
|
285
391
|
// echte order, en die komt via het lokale-orderpad in deze lijst.
|
|
@@ -303,7 +409,21 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
303
409
|
return fallback;
|
|
304
410
|
}
|
|
305
411
|
};
|
|
306
|
-
|
|
412
|
+
// 8b-ophalen) Vangnet-query start nu al, zodat hij tegelijk met 3b/5 loopt.
|
|
413
|
+
const mergedAwayGroupKeys = Array.from(new Set(localOrderRows.map((r) => String(r.floriday_order_group_key ?? "")).filter((k) => k.length > 0)));
|
|
414
|
+
const mergedAwayTask = mergedAwayGroupKeys.length
|
|
415
|
+
? (async () => {
|
|
416
|
+
const { data } = await supabase
|
|
417
|
+
.from("orders")
|
|
418
|
+
.select("id, floriday_sales_order_id, floriday_order_group_key, buffer_id")
|
|
419
|
+
.in("floriday_order_group_key", mergedAwayGroupKeys)
|
|
420
|
+
.not("deleted_at", "is", null)
|
|
421
|
+
.limit(2000);
|
|
422
|
+
return { data: (data ?? null) };
|
|
423
|
+
})().catch(() => ({ data: null }))
|
|
424
|
+
: Promise.resolve({ data: null });
|
|
425
|
+
const [, orderNumberRows, customerRows, floridayCustomerRows, tradeItemRows, carrierRows, crateDescriptions, groupPacking,] = await Promise.all([
|
|
426
|
+
shipmentsTask,
|
|
307
427
|
safe("Ordernummers", () => resolveOrderNumbers(supabase, foIdsForNumbers), new Map()),
|
|
308
428
|
safe("Klanten", async () => {
|
|
309
429
|
const orFilter = [
|
|
@@ -353,6 +473,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
353
473
|
loadCrateDescriptions(supabase, warnings),
|
|
354
474
|
safe("Productgroepen", () => loadGroupPacking(supabase), new Map()),
|
|
355
475
|
]);
|
|
476
|
+
t.mark("3b_5_referentie");
|
|
356
477
|
const orderNumberByFoId = orderNumberRows;
|
|
357
478
|
const carrierById = new Map();
|
|
358
479
|
for (const c of carrierRows)
|
|
@@ -455,12 +576,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
455
576
|
.filter((k) => k.length > 0)));
|
|
456
577
|
if (activeGroupKeys.length > 0) {
|
|
457
578
|
try {
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
.select("id, floriday_sales_order_id, floriday_order_group_key, buffer_id")
|
|
461
|
-
.in("floriday_order_group_key", activeGroupKeys)
|
|
462
|
-
.not("deleted_at", "is", null)
|
|
463
|
-
.limit(2000);
|
|
579
|
+
// Opgehaald tegelijk met stap 3b/5 (zelfde sleutels), hier toegepast.
|
|
580
|
+
const { data: mergedAway } = await mergedAwayTask;
|
|
464
581
|
const activeByKey = new Map();
|
|
465
582
|
for (const r of localOrderRows) {
|
|
466
583
|
const k = String(r.floriday_order_group_key ?? "");
|
|
@@ -762,51 +879,59 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
762
879
|
// 11) (vervallen) Mailbox-voorstellen worden niet meer als rij getoond.
|
|
763
880
|
// 12) Samenvoegen, buffergroottes, sorteren.
|
|
764
881
|
const all = [...localOrders, ...floridayOrders].sort((a, b) => (b.orderedAt ?? "").localeCompare(a.orderedAt ?? ""));
|
|
882
|
+
t.mark("9_12_dto");
|
|
765
883
|
// 12a) Engine-overzicht: karren, planten en pickdag komen uit
|
|
766
884
|
// public.logistics_order_overview. Eén waarheid voor Verkoop, Afhandeling
|
|
767
885
|
// en Pick — we tellen hier niets zelf meer voor de weergave.
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
886
|
+
// Alleen het venster van de getoonde orders (leverdatums, met marge voor de
|
|
887
|
+
// pickdag) i.p.v. de hele historie. Ontbreekt een leverdatum: geen venster.
|
|
888
|
+
const overviewWindow = overviewWindowFor(all.map((o) => o.deliveryAt ?? null));
|
|
889
|
+
const overviewTask = t.time("12a_overzicht", async () => {
|
|
890
|
+
if (all.length === 0)
|
|
891
|
+
return;
|
|
892
|
+
try {
|
|
893
|
+
const { data: overviewData, error: overviewError } = await supabase.rpc("logistics_order_overview", { p_from: overviewWindow.from, p_to: overviewWindow.to });
|
|
894
|
+
if (overviewError)
|
|
895
|
+
throw new Error(overviewError.message);
|
|
896
|
+
const overview = Array.isArray(overviewData) ? overviewData : [];
|
|
897
|
+
const engineByOrderId = new Map();
|
|
898
|
+
for (const row of overview) {
|
|
899
|
+
if (row?.order_uuid)
|
|
900
|
+
engineByOrderId.set(String(row.order_uuid), row);
|
|
901
|
+
}
|
|
902
|
+
const orderIdForDto = (o) => {
|
|
903
|
+
if (o.id.startsWith("local:"))
|
|
904
|
+
return o.id.slice("local:".length);
|
|
905
|
+
const row = localRowByFoId.get(o.id);
|
|
906
|
+
return row ? String(row.id) : null;
|
|
907
|
+
};
|
|
908
|
+
for (const o of all) {
|
|
909
|
+
const oid = orderIdForDto(o);
|
|
910
|
+
const row = oid ? engineByOrderId.get(oid) : null;
|
|
911
|
+
if (!row)
|
|
912
|
+
continue;
|
|
913
|
+
// Nooit terugvallen op 0: een leeg/nog-niet-berekend overzicht mag een
|
|
914
|
+
// bestaande karindeling niet wegpoetsen.
|
|
915
|
+
const engineCarts = Number(row.cart_count ?? 0);
|
|
916
|
+
if (engineCarts > 0)
|
|
917
|
+
o.karCount = engineCarts;
|
|
918
|
+
o.totalPieces = Number(row.plant_count ?? 0);
|
|
919
|
+
o.pickDate = row.pick_date ? String(row.pick_date) : null;
|
|
920
|
+
o.shifted = Boolean(row.shifted);
|
|
921
|
+
o.printedAt = row.printed_at ? String(row.printed_at) : null;
|
|
922
|
+
o.engineCounts = true;
|
|
923
|
+
}
|
|
777
924
|
}
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
return o.id.slice("local:".length);
|
|
781
|
-
const row = localRowByFoId.get(o.id);
|
|
782
|
-
return row ? String(row.id) : null;
|
|
783
|
-
};
|
|
784
|
-
for (const o of all) {
|
|
785
|
-
const oid = orderIdForDto(o);
|
|
786
|
-
const row = oid ? engineByOrderId.get(oid) : null;
|
|
787
|
-
if (!row)
|
|
788
|
-
continue;
|
|
789
|
-
// Nooit terugvallen op 0: een leeg/nog-niet-berekend overzicht mag een
|
|
790
|
-
// bestaande karindeling niet wegpoetsen.
|
|
791
|
-
const engineCarts = Number(row.cart_count ?? 0);
|
|
792
|
-
if (engineCarts > 0)
|
|
793
|
-
o.karCount = engineCarts;
|
|
794
|
-
o.totalPieces = Number(row.plant_count ?? 0);
|
|
795
|
-
o.pickDate = row.pick_date ? String(row.pick_date) : null;
|
|
796
|
-
o.shifted = Boolean(row.shifted);
|
|
797
|
-
o.printedAt = row.printed_at ? String(row.printed_at) : null;
|
|
798
|
-
o.engineCounts = true;
|
|
925
|
+
catch (e) {
|
|
926
|
+
warnings.push(`Engine-orderoverzicht niet beschikbaar: ${e?.message ?? e}`);
|
|
799
927
|
}
|
|
800
|
-
}
|
|
801
|
-
catch (e) {
|
|
802
|
-
warnings.push(`Engine-orderoverzicht niet beschikbaar: ${e?.message ?? e}`);
|
|
803
|
-
}
|
|
928
|
+
});
|
|
804
929
|
// 12a-ter) Ladingdragers en indelingsstatus komen uit de Engine
|
|
805
930
|
// (logistics_order_plan_coverage), alleen voor de zichtbare rijen — zie stap 14.
|
|
806
931
|
// 12a-bis) Ophaalmoment komt uit de Engine, alleen voor zichtbare rijen (stap 14).
|
|
807
932
|
// 12a) Weggehaalde beoordelingsmeldingen (vals alarm) — los vastgelegd,
|
|
808
933
|
// zodat de order zelf niet gewijzigd hoeft te worden.
|
|
809
|
-
{
|
|
934
|
+
const dismissalsTask = t.time("12g_beoordeling", async () => {
|
|
810
935
|
const reviewPairs = [];
|
|
811
936
|
for (const o of all) {
|
|
812
937
|
if (!o.needsManualReview)
|
|
@@ -824,7 +949,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
824
949
|
p.o.needsManualReview = null;
|
|
825
950
|
}
|
|
826
951
|
}
|
|
827
|
-
}
|
|
952
|
+
});
|
|
828
953
|
const sizeByBuffer = new Map();
|
|
829
954
|
for (const o of all) {
|
|
830
955
|
if (o.bufferId)
|
|
@@ -922,56 +1047,60 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
922
1047
|
backlogUnknown: members.some((m) => m.backlogUnknown),
|
|
923
1048
|
};
|
|
924
1049
|
};
|
|
925
|
-
// 12h) Achterstand: de Logistiek Engine beslist (logistics_order_backlog_info).
|
|
1050
|
+
// 12h) Achterstand: de Logistiek Engine beslist (logistics_order_backlog_info[_many]).
|
|
926
1051
|
// Wij berekenen hier nooit zelf een datum. Een order die niet opgevraagd
|
|
927
1052
|
// kan worden blijft gewoon onder "Te picken" staan met backlogUnknown;
|
|
928
1053
|
// er wordt niets weggeschreven. Bij de CSV-export (params.all) wordt de
|
|
929
|
-
// Engine niet per order bevraagd.
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
const
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
list
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
// Oudste leverdatum eerst: bij een limiet is de langste achterstand zeker bevraagd.
|
|
949
|
-
const candidateIds = Array.from(topickOrderIds).sort((a, b) => {
|
|
950
|
-
const da = dtosByOrderId.get(a)?.[0]?.deliveryAt ?? "";
|
|
951
|
-
const db = dtosByOrderId.get(b)?.[0]?.deliveryAt ?? "";
|
|
952
|
-
return da.localeCompare(db);
|
|
953
|
-
});
|
|
954
|
-
if (candidateIds.length) {
|
|
955
|
-
const { flags, failed, skipped } = await loadBacklogFlags(supabase, candidateIds);
|
|
956
|
-
for (const [orderId, flag] of flags) {
|
|
957
|
-
for (const dto of dtosByOrderId.get(orderId) ?? []) {
|
|
958
|
-
dto.backlog = !!flag?.backlog;
|
|
959
|
-
dto.backlogDays = flag?.days ?? null;
|
|
960
|
-
dto.backlogLeverdatum = flag?.deliveryDate ?? null;
|
|
961
|
-
}
|
|
962
|
-
}
|
|
963
|
-
for (const orderId of [...failed, ...skipped]) {
|
|
964
|
-
for (const dto of dtosByOrderId.get(orderId) ?? [])
|
|
965
|
-
dto.backlogUnknown = true;
|
|
966
|
-
}
|
|
967
|
-
if (failed.length) {
|
|
968
|
-
warnings.push(`Achterstand van ${failed.length} order(s) niet opgevraagd: achterstand onbekend.`);
|
|
1054
|
+
// Engine niet per order bevraagd. Loopt tegelijk met 12a.
|
|
1055
|
+
const backlogTask = t.time("12h_achterstand", async () => {
|
|
1056
|
+
if (!params.all) {
|
|
1057
|
+
const dtosByOrderId = new Map();
|
|
1058
|
+
const topickOrderIds = new Set();
|
|
1059
|
+
for (const o of all) {
|
|
1060
|
+
const orderId = o.id.startsWith("local:")
|
|
1061
|
+
? o.id.slice("local:".length)
|
|
1062
|
+
: (localRowByFoId.get(o.id)?.id ?? null);
|
|
1063
|
+
if (!orderId)
|
|
1064
|
+
continue;
|
|
1065
|
+
const key = String(orderId);
|
|
1066
|
+
const list = dtosByOrderId.get(key);
|
|
1067
|
+
if (list)
|
|
1068
|
+
list.push(o);
|
|
1069
|
+
else
|
|
1070
|
+
dtosByOrderId.set(key, [o]);
|
|
1071
|
+
if ((o.stage ?? "incoming") === "topick")
|
|
1072
|
+
topickOrderIds.add(key);
|
|
969
1073
|
}
|
|
970
|
-
|
|
971
|
-
|
|
1074
|
+
// Oudste leverdatum eerst: bij een limiet is de langste achterstand zeker bevraagd.
|
|
1075
|
+
const candidateIds = Array.from(topickOrderIds).sort((a, b) => {
|
|
1076
|
+
const da = dtosByOrderId.get(a)?.[0]?.deliveryAt ?? "";
|
|
1077
|
+
const db = dtosByOrderId.get(b)?.[0]?.deliveryAt ?? "";
|
|
1078
|
+
return da.localeCompare(db);
|
|
1079
|
+
});
|
|
1080
|
+
if (candidateIds.length) {
|
|
1081
|
+
const { flags, failed, skipped } = await loadBacklogFlags(supabase, candidateIds);
|
|
1082
|
+
for (const [orderId, flag] of flags) {
|
|
1083
|
+
for (const dto of dtosByOrderId.get(orderId) ?? []) {
|
|
1084
|
+
dto.backlog = !!flag?.backlog;
|
|
1085
|
+
dto.backlogDays = flag?.days ?? null;
|
|
1086
|
+
dto.backlogLeverdatum = flag?.deliveryDate ?? null;
|
|
1087
|
+
}
|
|
1088
|
+
}
|
|
1089
|
+
for (const orderId of [...failed, ...skipped]) {
|
|
1090
|
+
for (const dto of dtosByOrderId.get(orderId) ?? [])
|
|
1091
|
+
dto.backlogUnknown = true;
|
|
1092
|
+
}
|
|
1093
|
+
if (failed.length) {
|
|
1094
|
+
warnings.push(`Achterstand van ${failed.length} order(s) niet opgevraagd: achterstand onbekend.`);
|
|
1095
|
+
}
|
|
1096
|
+
if (skipped.length) {
|
|
1097
|
+
warnings.push(`Achterstand van ${skipped.length} order(s) niet opgevraagd: achterstand onbekend.`);
|
|
1098
|
+
}
|
|
972
1099
|
}
|
|
973
1100
|
}
|
|
974
|
-
}
|
|
1101
|
+
});
|
|
1102
|
+
await Promise.all([overviewTask, dismissalsTask, backlogTask]);
|
|
1103
|
+
t.mark("12_engine");
|
|
975
1104
|
// 13) Filteren (zoek + status), tellen, pagineren — op samengevouwen rijen.
|
|
976
1105
|
const search = (params.search ?? "").trim().toLowerCase();
|
|
977
1106
|
const matchesSearch = (members) => !search ||
|
|
@@ -1034,9 +1163,13 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1034
1163
|
const pageGroups = params.all
|
|
1035
1164
|
? filteredGroups.slice(0, EXPORT_CAP)
|
|
1036
1165
|
: filteredGroups.slice((page - 1) * pageSize, page * pageSize);
|
|
1166
|
+
t.mark("13_filter");
|
|
1037
1167
|
// 14) Indelingsstatus + karren uit de Engine (logistics_order_plan_coverage),
|
|
1038
1168
|
// alleen voor de zichtbare rijen, in één keer opgehaald. Deze module telt
|
|
1039
1169
|
// nooit zelf karren en leest order_carts/order_cart_items niet zelf.
|
|
1170
|
+
// Vertrek, vervoerder, dekking (14) en Floriday-stand (15) lopen tegelijk:
|
|
1171
|
+
// elk onderdeel schrijft alleen zijn eigen velden.
|
|
1172
|
+
const enrichTasks = [];
|
|
1040
1173
|
if (!params.all) {
|
|
1041
1174
|
const visible = pageGroups.flat();
|
|
1042
1175
|
const idFor = (o) => o.id.startsWith("local:")
|
|
@@ -1045,29 +1178,31 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1045
1178
|
const ids = visible.map(idFor).filter((v) => !!v);
|
|
1046
1179
|
if (ids.length) {
|
|
1047
1180
|
// Ophaalmoment uit de Engine (nooit zelf rekenen).
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
const
|
|
1054
|
-
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1181
|
+
enrichTasks.push(t.time("14a_vertrek", async () => {
|
|
1182
|
+
try {
|
|
1183
|
+
const { loadOrderDepartures } = await import("./order-departure.server.js");
|
|
1184
|
+
const { departureView } = await import("./order-departure.js");
|
|
1185
|
+
const deps = await loadOrderDepartures(supabase, ids);
|
|
1186
|
+
for (const o of visible) {
|
|
1187
|
+
const oid = idFor(o);
|
|
1188
|
+
if (!oid)
|
|
1189
|
+
continue;
|
|
1190
|
+
const v = departureView(deps.get(oid));
|
|
1191
|
+
o.pickupLabel = v.short
|
|
1192
|
+
? `${v.short}${v.lateSignup ? " · te laat aangemeld" : ""}`
|
|
1193
|
+
: deps.has(oid)
|
|
1194
|
+
? (v.reason ?? "onbekend")
|
|
1195
|
+
: "onbekend";
|
|
1196
|
+
}
|
|
1062
1197
|
}
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
}
|
|
1198
|
+
catch {
|
|
1199
|
+
for (const o of visible)
|
|
1200
|
+
if (idFor(o))
|
|
1201
|
+
o.pickupLabel = "onbekend";
|
|
1202
|
+
}
|
|
1203
|
+
}));
|
|
1069
1204
|
// Vervoerder + bron uit de Engine (contract vervoerder), één aanroep per blok.
|
|
1070
|
-
{
|
|
1205
|
+
enrichTasks.push(t.time("14b_vervoerder", async () => {
|
|
1071
1206
|
const { resolveCarriersMany } = await import("./carrier-resolve.server.js");
|
|
1072
1207
|
const reqs = visible
|
|
1073
1208
|
.map((o) => ({ o, id: idFor(o) }))
|
|
@@ -1085,56 +1220,58 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1085
1220
|
}
|
|
1086
1221
|
if (res.error)
|
|
1087
1222
|
warnings.push(`Vervoerder: ${res.error}`);
|
|
1088
|
-
}
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
const
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1223
|
+
}));
|
|
1224
|
+
enrichTasks.push(t.time("14c_dekking", async () => {
|
|
1225
|
+
const coverage = await loadPlanCoverage(supabase, ids, "list");
|
|
1226
|
+
let failed = 0;
|
|
1227
|
+
for (const o of visible) {
|
|
1228
|
+
const oid = idFor(o);
|
|
1229
|
+
const c = oid ? coverage.get(oid) : undefined;
|
|
1230
|
+
if (!c)
|
|
1231
|
+
continue;
|
|
1232
|
+
o.planCoverage = summarize(c);
|
|
1233
|
+
if (c.state === "onbekend") {
|
|
1234
|
+
failed++;
|
|
1235
|
+
continue; // fail closed: bestaande Engine-telling laten staan
|
|
1236
|
+
}
|
|
1237
|
+
const inGroup = (o.bufferSize ?? 1) > 1 && !!o.bufferId;
|
|
1238
|
+
if (!inGroup) {
|
|
1239
|
+
o.karCount = combinedCartCount([c]) ?? 0;
|
|
1240
|
+
o.karUnknown = combinedCartCount([c]) == null;
|
|
1241
|
+
o.karShared = false;
|
|
1242
|
+
}
|
|
1243
|
+
// Lijstversie levert geen dragertype: bestaand type laten staan.
|
|
1244
|
+
if (c.carts.length > 0 || (c.cartCount ?? 0) === 0)
|
|
1245
|
+
o.cartTypeName =
|
|
1246
|
+
c.carts.length > 0
|
|
1247
|
+
? mergeTypeNames(c.carts.map((k) => engineLoadCarrierLabel(normalizeLoadCarrierCode(k.carrierType) ?? k.carrierType ?? "") ??
|
|
1248
|
+
null))
|
|
1249
|
+
: null;
|
|
1250
|
+
o.engineCounts = true;
|
|
1100
1251
|
}
|
|
1101
|
-
|
|
1102
|
-
|
|
1103
|
-
|
|
1104
|
-
|
|
1105
|
-
|
|
1252
|
+
// Gecombineerde orders: karren op unieke cart_id (buffer_cart_count van de
|
|
1253
|
+
// Engine). Ontbreekt dat, dan "Karren onbekend" — nooit optellen.
|
|
1254
|
+
for (const g of pageGroups) {
|
|
1255
|
+
if (g.length < 2 && !((g[0]?.bufferSize ?? 1) > 1 && g[0]?.bufferId))
|
|
1256
|
+
continue;
|
|
1257
|
+
const covs = g
|
|
1258
|
+
.map((m) => { const id = idFor(m); return id ? coverage.get(id) : undefined; })
|
|
1259
|
+
.filter((x) => !!x && x.state !== "onbekend");
|
|
1260
|
+
const n = covs.length === g.length ? combinedCartCount(covs.length === 1 ? [{ ...covs[0], shared: true }] : covs) : null;
|
|
1261
|
+
for (const m of g) {
|
|
1262
|
+
m.karCount = n ?? 0;
|
|
1263
|
+
m.karUnknown = n == null;
|
|
1264
|
+
m.karShared = true;
|
|
1265
|
+
m.bufferCartCount = n;
|
|
1266
|
+
// De lijstversie van de Engine levert geen dragertype: geen eigen
|
|
1267
|
+
// schatting per order tonen (gaf wisselende types en "Gemengd").
|
|
1268
|
+
m.cartTypeName = null;
|
|
1269
|
+
}
|
|
1106
1270
|
}
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
o.cartTypeName =
|
|
1110
|
-
c.carts.length > 0
|
|
1111
|
-
? mergeTypeNames(c.carts.map((k) => engineLoadCarrierLabel(normalizeLoadCarrierCode(k.carrierType) ?? k.carrierType ?? "") ??
|
|
1112
|
-
null))
|
|
1113
|
-
: null;
|
|
1114
|
-
o.engineCounts = true;
|
|
1115
|
-
}
|
|
1116
|
-
// Gecombineerde orders: karren op unieke cart_id (buffer_cart_count van de
|
|
1117
|
-
// Engine). Ontbreekt dat, dan "Karren onbekend" — nooit optellen.
|
|
1118
|
-
for (const g of pageGroups) {
|
|
1119
|
-
if (g.length < 2 && !((g[0]?.bufferSize ?? 1) > 1 && g[0]?.bufferId))
|
|
1120
|
-
continue;
|
|
1121
|
-
const covs = g
|
|
1122
|
-
.map((m) => { const id = idFor(m); return id ? coverage.get(id) : undefined; })
|
|
1123
|
-
.filter((x) => !!x && x.state !== "onbekend");
|
|
1124
|
-
const n = covs.length === g.length ? combinedCartCount(covs.length === 1 ? [{ ...covs[0], shared: true }] : covs) : null;
|
|
1125
|
-
for (const m of g) {
|
|
1126
|
-
m.karCount = n ?? 0;
|
|
1127
|
-
m.karUnknown = n == null;
|
|
1128
|
-
m.karShared = true;
|
|
1129
|
-
m.bufferCartCount = n;
|
|
1130
|
-
// De lijstversie van de Engine levert geen dragertype: geen eigen
|
|
1131
|
-
// schatting per order tonen (gaf wisselende types en "Gemengd").
|
|
1132
|
-
m.cartTypeName = null;
|
|
1271
|
+
if (failed > 0) {
|
|
1272
|
+
warnings.push(`Van ${failed} order(s) is de karverdeling nu niet bekend. Ververs over een minuut.`);
|
|
1133
1273
|
}
|
|
1134
|
-
}
|
|
1135
|
-
if (failed > 0) {
|
|
1136
|
-
warnings.push(`Van ${failed} order(s) is de karverdeling nu niet bekend. Ververs over een minuut.`);
|
|
1137
|
-
}
|
|
1274
|
+
}));
|
|
1138
1275
|
}
|
|
1139
1276
|
}
|
|
1140
1277
|
// 15) Floriday-stand uit het statusoverzicht (alleen weergave), alleen voor de
|
|
@@ -1148,21 +1285,27 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1148
1285
|
: [];
|
|
1149
1286
|
const allIds = Array.from(new Set(visible.flatMap(idsOf))).slice(0, 100);
|
|
1150
1287
|
if (allIds.length) {
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
const
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
|
|
1158
|
-
|
|
1159
|
-
|
|
1160
|
-
|
|
1288
|
+
enrichTasks.push(t.time("15_floriday_stand", async () => {
|
|
1289
|
+
const { loadFloridayStatuses } = await import("./floriday-status.server.js");
|
|
1290
|
+
const res = await loadFloridayStatuses(allIds);
|
|
1291
|
+
for (const o of visible) {
|
|
1292
|
+
const ids = idsOf(o);
|
|
1293
|
+
if (!ids.length)
|
|
1294
|
+
continue;
|
|
1295
|
+
o.floridayStatus = summarizeFloridayStatus(ids, res.entries, res.error);
|
|
1296
|
+
}
|
|
1297
|
+
if (res.error)
|
|
1298
|
+
warnings.push(`Floriday-stand niet beschikbaar (${res.error}).`);
|
|
1299
|
+
}));
|
|
1161
1300
|
}
|
|
1162
1301
|
}
|
|
1302
|
+
await Promise.all(enrichTasks);
|
|
1303
|
+
t.mark("14_15_verrijking");
|
|
1163
1304
|
const rows = pageGroups.map(mergeGroup);
|
|
1164
1305
|
// Totalen over de volledige gefilterde set (alle orders in elke buffer).
|
|
1165
1306
|
const totals = computeTotals(filteredGroups.map(mergeGroup));
|
|
1307
|
+
t.mark("16_samenvoegen");
|
|
1308
|
+
const timing = t.done(params.localOrderId ? "detail" : params.all ? "export" : "lijst");
|
|
1166
1309
|
return {
|
|
1167
1310
|
rows,
|
|
1168
1311
|
totalCount,
|
|
@@ -1172,10 +1315,20 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1172
1315
|
environment,
|
|
1173
1316
|
warnings,
|
|
1174
1317
|
truncated,
|
|
1318
|
+
timing,
|
|
1175
1319
|
};
|
|
1176
1320
|
}
|
|
1177
|
-
// Belading per productgroep
|
|
1321
|
+
// Belading per productgroep: vaste referentiedata, 10 min in het servergeheugen.
|
|
1322
|
+
let groupPackingCache = null;
|
|
1178
1323
|
async function loadGroupPacking(supabase) {
|
|
1324
|
+
if (groupPackingCache && Date.now() - groupPackingCache.at < TTL_MS)
|
|
1325
|
+
return groupPackingCache.value;
|
|
1326
|
+
const value = await loadGroupPackingUncached(supabase);
|
|
1327
|
+
groupPackingCache = { at: Date.now(), value };
|
|
1328
|
+
return value;
|
|
1329
|
+
}
|
|
1330
|
+
// Belading per productgroep (op naam), gebruikt voor "[Groep] X"-regels.
|
|
1331
|
+
async function loadGroupPackingUncached(supabase) {
|
|
1179
1332
|
const [groupsRes, mirrorRes] = await Promise.all([
|
|
1180
1333
|
supabase.from("product_groups").select("id, name, head_product_id").limit(5000),
|
|
1181
1334
|
supabase
|