@flowselections/logistiek-engine 1.0.189 → 1.0.191
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/db/schema/logistiek-engine.sql +1273 -0
- package/dist-lib/components/BeladingIndelingCard.d.ts.map +1 -1
- package/dist-lib/components/BeladingIndelingCard.js +4 -2
- package/dist-lib/components/GeblokkeerdeOrdersCard.d.ts.map +1 -1
- package/dist-lib/components/GeblokkeerdeOrdersCard.js +43 -4
- package/dist-lib/components/LadingdragersPage.d.ts.map +1 -1
- package/dist-lib/components/LadingdragersPage.js +4 -1
- package/dist-lib/components/OrdersZonderKarCard.d.ts +2 -0
- package/dist-lib/components/OrdersZonderKarCard.d.ts.map +1 -0
- package/dist-lib/components/OrdersZonderKarCard.js +36 -0
- package/dist-lib/components/RegiePage.d.ts.map +1 -1
- package/dist-lib/components/RegiePage.js +2 -1
- package/dist-lib/components/RuleEnginePage.js +8 -3
- package/dist-lib/hooks/useFloricodeLadingdragers.d.ts +2 -0
- package/dist-lib/hooks/useFloricodeLadingdragers.d.ts.map +1 -0
- package/dist-lib/hooks/useFloricodeLadingdragers.js +25 -0
- package/dist-lib/hooks/useGeblokkeerdeOrders.d.ts +1 -0
- package/dist-lib/hooks/useGeblokkeerdeOrders.d.ts.map +1 -1
- package/dist-lib/hooks/useGeblokkeerdeOrders.js +38 -1
- package/dist-lib/hooks/useRecalcJob.d.ts +1 -0
- package/dist-lib/hooks/useRecalcJob.d.ts.map +1 -1
- package/dist-lib/hooks/useRecalcJob.js +11 -1
- package/dist-lib/integrations/supabase/types.d.ts +407 -1
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/beladingRegels.d.ts +18 -0
- package/dist-lib/lib/beladingRegels.d.ts.map +1 -1
- package/dist-lib/lib/beladingRegels.js +28 -0
- package/dist-lib/lib/handlers/logistics-tick.server.d.ts.map +1 -1
- package/dist-lib/lib/handlers/logistics-tick.server.js +14 -0
- package/dist-lib/lib/loadCarrierPlanner.d.ts +3 -0
- package/dist-lib/lib/loadCarrierPlanner.d.ts.map +1 -1
- package/dist-lib/lib/loadCarrierPlanner.js +18 -13
- package/dist-lib/lib/loadCarrierPlanning.server.d.ts +16 -0
- package/dist-lib/lib/loadCarrierPlanning.server.d.ts.map +1 -1
- package/dist-lib/lib/loadCarrierPlanning.server.js +394 -24
- package/dist-lib/lib/loadCarrierTypes.d.ts +7 -0
- package/dist-lib/lib/loadCarrierTypes.d.ts.map +1 -1
- package/dist-lib/lib/loadCarrierTypes.js +17 -0
- package/dist-lib/lib/logisticsRecalcJob.server.d.ts +1 -0
- package/dist-lib/lib/logisticsRecalcJob.server.d.ts.map +1 -1
- package/dist-lib/lib/logisticsRecalcJob.server.js +3 -1
- package/dist-lib/lib/logisticsRecalculate.functions.js +2 -2
- package/dist-lib/lib/moduleVersion.d.ts +1 -1
- package/dist-lib/lib/moduleVersion.js +1 -1
- package/dist-lib/lib/planQueue.server.d.ts.map +1 -1
- package/dist-lib/lib/planQueue.server.js +6 -1
- package/dist-lib/lib/ruleEngineSchema.d.ts.map +1 -1
- package/dist-lib/lib/ruleEngineSchema.js +9 -0
- package/dist-lib/lib/scheduleTasks.server.d.ts +18 -0
- package/dist-lib/lib/scheduleTasks.server.d.ts.map +1 -0
- package/dist-lib/lib/scheduleTasks.server.js +65 -0
- package/package.json +1 -1
|
@@ -104,13 +104,14 @@ export async function tickJob(sb) {
|
|
|
104
104
|
const { data: current } = await sb.from(TABLE).select("*").eq("id", job.id).maybeSingle();
|
|
105
105
|
return (current ?? null);
|
|
106
106
|
}
|
|
107
|
+
export { scheduleTasksPerOrder } from "./scheduleTasks.server.js";
|
|
108
|
+
import { scheduleTasksPerOrder } from "./scheduleTasks.server.js";
|
|
107
109
|
/** Draait de afsluitende herberekenstappen (planning, tellingen, capaciteit). */
|
|
108
110
|
export async function runFinalSteps(sb, days = 21) {
|
|
109
111
|
const today = new Date();
|
|
110
112
|
const until = new Date(today.getTime() + days * 24 * 60 * 60 * 1000);
|
|
111
113
|
const iso = (d) => d.toISOString().slice(0, 10);
|
|
112
114
|
const calls = [
|
|
113
|
-
{ step: "Taken opnieuw inplannen", fn: "logistics_schedule_tasks", args: {} },
|
|
114
115
|
{ step: "Ladingdragers tellen", fn: "logistics_sync_task_carriers", args: { p_order_ref: null } },
|
|
115
116
|
{ step: "Pickwachtrij bijwerken", fn: "logistics_sync_pick_queue", args: {} },
|
|
116
117
|
{ step: "Dubbele bufferregels opruimen", fn: "logistics_prune_buffer_member_queue", args: {} },
|
|
@@ -122,6 +123,7 @@ export async function runFinalSteps(sb, days = 21) {
|
|
|
122
123
|
},
|
|
123
124
|
];
|
|
124
125
|
const steps = [];
|
|
126
|
+
steps.push(await scheduleTasksPerOrder(sb));
|
|
125
127
|
for (const call of calls) {
|
|
126
128
|
const { error } = await sb.rpc(call.fn, call.args);
|
|
127
129
|
steps.push({ step: call.step, ok: !error, ...(error ? { error: error.message } : {}) });
|
|
@@ -17,7 +17,6 @@ export const recalculateLogistics = createServerFn({ method: "POST" })
|
|
|
17
17
|
const until = new Date(today.getTime() + days * 24 * 60 * 60 * 1000);
|
|
18
18
|
const iso = (d) => d.toISOString().slice(0, 10);
|
|
19
19
|
const calls = [
|
|
20
|
-
{ step: "Taken opnieuw inplannen", fn: "logistics_schedule_tasks", args: {} },
|
|
21
20
|
{ step: "Ladingdragers tellen", fn: "logistics_sync_task_carriers", args: { p_order_ref: null } },
|
|
22
21
|
{ step: "Pickwachtrij bijwerken", fn: "logistics_sync_pick_queue", args: {} },
|
|
23
22
|
{ step: "Dubbele bufferregels opruimen", fn: "logistics_prune_buffer_member_queue", args: {} },
|
|
@@ -28,7 +27,8 @@ export const recalculateLogistics = createServerFn({ method: "POST" })
|
|
|
28
27
|
args: { p_from: iso(today), p_to: iso(until) },
|
|
29
28
|
},
|
|
30
29
|
];
|
|
31
|
-
const
|
|
30
|
+
const { scheduleTasksPerOrder } = await import("./scheduleTasks.server.js");
|
|
31
|
+
const steps = [await scheduleTasksPerOrder(context.supabase)];
|
|
32
32
|
for (const call of calls) {
|
|
33
33
|
const { error } = await context.supabase.rpc(call.fn, call.args);
|
|
34
34
|
steps.push({ step: call.step, ok: !error, ...(error ? { error: error.message } : {}) });
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const MODULE_VERSION = "1.0.
|
|
1
|
+
export declare const MODULE_VERSION = "1.0.191";
|
|
2
2
|
//# sourceMappingURL=moduleVersion.d.ts.map
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Automatisch gegenereerd door prebuild:lib; niet handmatig aanpassen.
|
|
2
|
-
export const MODULE_VERSION = "1.0.
|
|
2
|
+
export const MODULE_VERSION = "1.0.191";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"planQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/planQueue.server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"planQueue.server.d.ts","sourceRoot":"","sources":["../../src/lib/planQueue.server.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAU5D,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,2FAA2F;IAC3F,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAwBD,wFAAwF;AACxF,wBAAsB,YAAY,CAChC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,GAC3D,OAAO,CAAC,eAAe,CAAC,CA8S1B;AAmCD,iGAAiG;AACjG,eAAO,MAAM,eAAe,0EAA2E,CAAC;AAgCxG,4EAA4E;AAE5E,wBAAsB,cAAc,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE"}
|
|
@@ -13,6 +13,7 @@ import { trace, newTraceId, classifyError } from "./trace.server.js";
|
|
|
13
13
|
import { FLOW_NODE } from "./flowNodes.js";
|
|
14
14
|
import { completePlannerDiffRuns, skipPlannerDiffRuns } from "./plannerDiff.server.js";
|
|
15
15
|
import { opnieuwOverSeconden } from "./beladingRegels.js";
|
|
16
|
+
import { scheduleTasksPerOrder } from "./scheduleTasks.server.js";
|
|
16
17
|
const EMPTY = {
|
|
17
18
|
claimed: 0,
|
|
18
19
|
planned: 0,
|
|
@@ -319,7 +320,6 @@ async function runDayLevelSteps(sb, dates, result) {
|
|
|
319
320
|
const from = sorted[0] && sorted[0] < today ? sorted[0] : today;
|
|
320
321
|
const to = sorted.length > 0 ? sorted[sorted.length - 1] : today;
|
|
321
322
|
const calls = [
|
|
322
|
-
{ fn: "logistics_schedule_tasks", args: {} },
|
|
323
323
|
{ fn: "logistics_sync_task_carriers", args: { p_order_ref: null } },
|
|
324
324
|
{ fn: "logistics_sync_pick_queue", args: {} },
|
|
325
325
|
{ fn: "logistics_prune_buffer_member_queue", args: {} },
|
|
@@ -329,6 +329,11 @@ async function runDayLevelSteps(sb, dates, result) {
|
|
|
329
329
|
// picken, controle, afgehandeld). Alleen meekijkend.
|
|
330
330
|
{ fn: "logistics_trace_progress", args: { p_limit: 200 } },
|
|
331
331
|
];
|
|
332
|
+
{
|
|
333
|
+
const r = await scheduleTasksPerOrder(sb);
|
|
334
|
+
if (!r.ok && result.errors.length < 10)
|
|
335
|
+
result.errors.push(`logistics_schedule_tasks: ${r.error}`);
|
|
336
|
+
}
|
|
332
337
|
for (const call of calls) {
|
|
333
338
|
const { error } = await sb.rpc(call.fn, call.args);
|
|
334
339
|
if (error && result.errors.length < 10)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleEngineSchema.d.ts","sourceRoot":"","sources":["../../src/lib/ruleEngineSchema.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,UAAU,GACV,MAAM,GACN,UAAU,GACV,OAAO,GACP,MAAM,GACN,QAAQ,GACR,aAAa,GACb,SAAS,GACT,SAAS,GACT,UAAU,CAAC;AAMf,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,OAAO,EAAE,CAAC;IACd,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,wFAAwF;IACxF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,QAAQ,CAAC,EAAE;QACT,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,wGAAwG;IACxG,SAAS,CAAC,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC;CAC/C;AAGD,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAID,eAAO,MAAM,gBAAgB,EAAE,WAAW,EAQzC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,WAAW,EAK5C,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,UAAU,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAI9D,eAAO,MAAM,UAAU,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"ruleEngineSchema.d.ts","sourceRoot":"","sources":["../../src/lib/ruleEngineSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,6 +64,15 @@ export const RULE_STEPS = [
|
|
|
64
64
|
description: "Staat dit uit, dan blijven reserveringen altijd los. Staat het aan, dan gelden voor reserveringen exact dezelfde combineerregels; nog onbekende gegevens tellen niet mee.",
|
|
65
65
|
dependsOn: { key: "buffer_enabled", in: [true] },
|
|
66
66
|
},
|
|
67
|
+
{
|
|
68
|
+
// 1.0.190: zichtbare instelling; vervangt de onzichtbare omgevingsinstelling.
|
|
69
|
+
key: "rebuffer_on_change",
|
|
70
|
+
label: "Opnieuw indelen bij wijziging",
|
|
71
|
+
type: "toggle",
|
|
72
|
+
default: true,
|
|
73
|
+
description: "Staat dit aan, dan worden bestaande open orders opnieuw gecombineerd zodra de combineerregels veranderen. Vrijgegeven orders, orders in de pickrij en orders met een geprinte of gescande kar worden nooit verplaatst.",
|
|
74
|
+
dependsOn: { key: "buffer_enabled", in: [true] },
|
|
75
|
+
},
|
|
67
76
|
{
|
|
68
77
|
key: "buffer_match",
|
|
69
78
|
label: "Orders combineren wanneer deze gegevens gelijk zijn",
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { SupabaseClient } from "@supabase/supabase-js";
|
|
2
|
+
/**
|
|
3
|
+
* 1.0.190: "Taken opnieuw inplannen" per order in plaats van één grote aanroep
|
|
4
|
+
* (die liep op een time-out). Dezelfde selectie als de globale aanroep:
|
|
5
|
+
* orders met open taken (planned/ready), niet verwijderd, en niet in het
|
|
6
|
+
* overgangsvenster departure_rule_since..rule_160_since. Taken zonder order
|
|
7
|
+
* worden door logistics_schedule_tasks nooit geraakt, ook niet globaal.
|
|
8
|
+
*/
|
|
9
|
+
export declare function scheduleTasksPerOrder(sb: SupabaseClient): Promise<{
|
|
10
|
+
step: string;
|
|
11
|
+
ok: boolean;
|
|
12
|
+
error?: undefined;
|
|
13
|
+
} | {
|
|
14
|
+
step: string;
|
|
15
|
+
ok: boolean;
|
|
16
|
+
error: string;
|
|
17
|
+
}>;
|
|
18
|
+
//# sourceMappingURL=scheduleTasks.server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scheduleTasks.server.d.ts","sourceRoot":"","sources":["../../src/lib/scheduleTasks.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,cAAc;;;;;;;;GAiD7D"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 1.0.190: "Taken opnieuw inplannen" per order in plaats van één grote aanroep
|
|
3
|
+
* (die liep op een time-out). Dezelfde selectie als de globale aanroep:
|
|
4
|
+
* orders met open taken (planned/ready), niet verwijderd, en niet in het
|
|
5
|
+
* overgangsvenster departure_rule_since..rule_160_since. Taken zonder order
|
|
6
|
+
* worden door logistics_schedule_tasks nooit geraakt, ook niet globaal.
|
|
7
|
+
*/
|
|
8
|
+
export async function scheduleTasksPerOrder(sb) {
|
|
9
|
+
const step = "Taken opnieuw inplannen";
|
|
10
|
+
try {
|
|
11
|
+
const { data: ts } = await sb
|
|
12
|
+
.from("logistics_time_settings")
|
|
13
|
+
.select("departure_rule_since, rule_160_since")
|
|
14
|
+
.order("updated_at", { ascending: false, nullsFirst: false })
|
|
15
|
+
.limit(1);
|
|
16
|
+
const since = ts?.[0]?.departure_rule_since ?? null;
|
|
17
|
+
const r160 = ts?.[0]?.rule_160_since ?? null;
|
|
18
|
+
const refs = new Set();
|
|
19
|
+
for (let from = 0;; from += 1000) {
|
|
20
|
+
const { data, error } = await sb
|
|
21
|
+
.from("logistics_tasks")
|
|
22
|
+
.select("order_ref")
|
|
23
|
+
.in("status", ["planned", "ready"])
|
|
24
|
+
.not("order_ref", "is", null)
|
|
25
|
+
.range(from, from + 999);
|
|
26
|
+
if (error)
|
|
27
|
+
throw new Error(error.message);
|
|
28
|
+
const rows = Array.isArray(data) ? data : [];
|
|
29
|
+
for (const r of rows)
|
|
30
|
+
if (r.order_ref)
|
|
31
|
+
refs.add(String(r.order_ref));
|
|
32
|
+
if (rows.length < 1000)
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
35
|
+
const lijst = [...refs];
|
|
36
|
+
const toegestaan = [];
|
|
37
|
+
for (let s = 0; s < lijst.length; s += 200) {
|
|
38
|
+
const { data, error } = await sb
|
|
39
|
+
.from("orders")
|
|
40
|
+
.select("order_number, created_at")
|
|
41
|
+
.in("order_number", lijst.slice(s, s + 200))
|
|
42
|
+
.is("deleted_at", null);
|
|
43
|
+
if (error)
|
|
44
|
+
throw new Error(error.message);
|
|
45
|
+
for (const o of Array.isArray(data) ? data : []) {
|
|
46
|
+
const c = String(o.created_at ?? "");
|
|
47
|
+
const inVenster = since && r160 && c >= since && c < r160;
|
|
48
|
+
if (!inVenster)
|
|
49
|
+
toegestaan.push(String(o.order_number));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const fouten = [];
|
|
53
|
+
for (const ref of toegestaan) {
|
|
54
|
+
const { error } = await sb.rpc("logistics_schedule_tasks", { p_order_ref: ref });
|
|
55
|
+
if (error)
|
|
56
|
+
fouten.push(`${ref}: ${error.message}`);
|
|
57
|
+
}
|
|
58
|
+
return fouten.length === 0
|
|
59
|
+
? { step, ok: true }
|
|
60
|
+
: { step, ok: false, error: `${fouten.length} van ${toegestaan.length} order(s) niet ingepland: ${fouten.slice(0, 3).join(" | ")}` };
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
return { step, ok: false, error: e?.message ? String(e.message) : String(e) };
|
|
64
|
+
}
|
|
65
|
+
}
|