@flowselections/logistiek-engine 1.0.98 → 1.0.99
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/lib/expandGroups.test.d.ts +2 -0
- package/dist-lib/lib/expandGroups.test.d.ts.map +1 -0
- package/dist-lib/lib/expandGroups.test.js +80 -0
- package/dist-lib/lib/loadCarrierPlanning.server.d.ts.map +1 -1
- package/dist-lib/lib/loadCarrierPlanning.server.js +20 -0
- package/dist-lib/lib/moduleVersion.d.ts +2 -0
- package/dist-lib/lib/moduleVersion.d.ts.map +1 -0
- package/dist-lib/lib/moduleVersion.js +2 -0
- package/package.json +2 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expandGroups.test.d.ts","sourceRoot":"","sources":["../../src/lib/expandGroups.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { expandOrderItemsForPlanner } from "./loadCarrierPlanning.server";
|
|
3
|
+
function stub(tables) {
|
|
4
|
+
return {
|
|
5
|
+
from(table) {
|
|
6
|
+
let rows = [...(tables[table] ?? [])];
|
|
7
|
+
const b = {
|
|
8
|
+
select: () => b,
|
|
9
|
+
order: () => b,
|
|
10
|
+
in: (col, vals) => {
|
|
11
|
+
rows = rows.filter((r) => vals.includes(r[col]));
|
|
12
|
+
return b;
|
|
13
|
+
},
|
|
14
|
+
eq: (col, v) => {
|
|
15
|
+
rows = rows.filter((r) => r[col] === v);
|
|
16
|
+
return b;
|
|
17
|
+
},
|
|
18
|
+
or: (expr) => {
|
|
19
|
+
const conds = expr.split(",").map((c) => {
|
|
20
|
+
const [col, , ...rest] = c.split(".");
|
|
21
|
+
return [col, rest.join(".")];
|
|
22
|
+
});
|
|
23
|
+
rows = rows.filter((r) => conds.some(([col, v]) => String(r[col]) === v));
|
|
24
|
+
return b;
|
|
25
|
+
},
|
|
26
|
+
then: (res) => res({ data: rows }),
|
|
27
|
+
};
|
|
28
|
+
return b;
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
const GERBERA = "11111111-1111-4111-8111-111111111111";
|
|
33
|
+
const GROUP = "22222222-2222-4222-8222-222222222222";
|
|
34
|
+
const KOPIE = "33333333-3333-4333-8333-333333333333";
|
|
35
|
+
const ONBEKEND = "44444444-4444-4444-8444-444444444444";
|
|
36
|
+
const products = [
|
|
37
|
+
{ id: GERBERA, product: "Gerbera Red Naomi #9", floriday_trade_item_id: GERBERA, plants_per_crate: 20, crates_per_layer: 8, layers_per_cart: 12 },
|
|
38
|
+
{ id: KOPIE, product: "Flow Selections plant (kopie)", floriday_trade_item_id: KOPIE, plants_per_crate: 6, crates_per_layer: 6, layers_per_cart: 6 },
|
|
39
|
+
];
|
|
40
|
+
describe("expandOrderItemsForPlanner — productgroepen", () => {
|
|
41
|
+
it("gekoppeld artikel gaat voor een productgroep met dezelfde naam", async () => {
|
|
42
|
+
const sb = stub({
|
|
43
|
+
products,
|
|
44
|
+
product_groups: [{ id: GROUP, name: "Gerbera Red Naomi #9" }],
|
|
45
|
+
product_group_items: [{ product_group_id: GROUP, trade_item_id: KOPIE, quantity: 1, sort_order: 0 }],
|
|
46
|
+
});
|
|
47
|
+
const out = await expandOrderItemsForPlanner(sb, [
|
|
48
|
+
{
|
|
49
|
+
id: "regel-1",
|
|
50
|
+
order_id: "o1",
|
|
51
|
+
product_id: GERBERA,
|
|
52
|
+
product_name: "Gerbera Red Naomi #9",
|
|
53
|
+
quantity: 240,
|
|
54
|
+
products: products[0],
|
|
55
|
+
},
|
|
56
|
+
]);
|
|
57
|
+
expect(out).toHaveLength(1);
|
|
58
|
+
expect(out[0].product_id).toBe(GERBERA);
|
|
59
|
+
expect(out[0].product_name).toBe("Gerbera Red Naomi #9");
|
|
60
|
+
expect(out[0].plants).toBe(240);
|
|
61
|
+
});
|
|
62
|
+
it("onbekend groepslid krijgt geen id als naam en blokkeert", async () => {
|
|
63
|
+
const sources = new Map();
|
|
64
|
+
const sb = stub({
|
|
65
|
+
products,
|
|
66
|
+
product_groups: [{ id: GROUP, name: "Mix" }],
|
|
67
|
+
product_group_items: [
|
|
68
|
+
{ product_group_id: GROUP, trade_item_id: ONBEKEND, quantity: 1, sort_order: 0 },
|
|
69
|
+
{ product_group_id: GROUP, trade_item_id: KOPIE, quantity: 1, sort_order: 1 },
|
|
70
|
+
],
|
|
71
|
+
});
|
|
72
|
+
const out = await expandOrderItemsForPlanner(sb, [{ id: "regel-2", order_id: "o1", product_id: GROUP, product_name: "Mix", quantity: 12 }], { sources: sources });
|
|
73
|
+
for (const i of out)
|
|
74
|
+
expect(i.product_name).not.toContain(ONBEKEND);
|
|
75
|
+
const onbekend = out.find((i) => i.order_item_id === `regel-2::${ONBEKEND}`);
|
|
76
|
+
expect(onbekend?.product_id ?? null).toBeNull();
|
|
77
|
+
expect(onbekend?.product_name).toBe("Mix — onbekend groepslid");
|
|
78
|
+
expect(sources.get(`regel-2::${ONBEKEND}`)).toBe("geen");
|
|
79
|
+
});
|
|
80
|
+
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadCarrierPlanning.server.d.ts","sourceRoot":"","sources":["../../src/lib/loadCarrierPlanning.server.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,eAAe,EAEpB,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"loadCarrierPlanning.server.d.ts","sourceRoot":"","sources":["../../src/lib/loadCarrierPlanning.server.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
// naar order_carts / order_cart_items.
|
|
7
7
|
// ============================================================================
|
|
8
8
|
import { planLoadUnits, LOAD_CARRIER_PLANNER_VERSION, } from "./loadCarrierPlanner";
|
|
9
|
+
import { traceBatch } from "./trace.server";
|
|
10
|
+
import { MODULE_VERSION } from "./moduleVersion";
|
|
9
11
|
import { fallbackCarrierProfile } from "./loadCarrierTypes";
|
|
10
12
|
import { planByDimensions, DIMENSION_PLANNER_VERSION } from "./dimensionPlanner";
|
|
11
13
|
import { buildDimensionItems, carrierDimensions } from "./dimensionData.server";
|
|
@@ -1031,6 +1033,24 @@ async function replanBufferUnlocked(sb, bufferId, options = {}) {
|
|
|
1031
1033
|
for (const s of sources.values())
|
|
1032
1034
|
beladingSources[s] = (beladingSources[s] ?? 0) + 1;
|
|
1033
1035
|
console.log(`[logistiek-engine] buffer ${bufferId}: beladingbronnen ${JSON.stringify(beladingSources)}`);
|
|
1036
|
+
// Sporenregel: welke codeversie en welke groepsregel deze ronde gebruikte.
|
|
1037
|
+
try {
|
|
1038
|
+
const orderIdsInRonde = [...new Set(itemToOrder.values())];
|
|
1039
|
+
await traceBatch(sb, orderIdsInRonde.map((oid) => ({
|
|
1040
|
+
orderRef: oid,
|
|
1041
|
+
phase: "indeling",
|
|
1042
|
+
step: "Planner-logica vastgelegd",
|
|
1043
|
+
status: "geslaagd",
|
|
1044
|
+
actor: "planner",
|
|
1045
|
+
decision: `Moduleversie ${MODULE_VERSION}`,
|
|
1046
|
+
reason: "Een bestelregel die aan een echt artikel gekoppeld is, blijft dat artikel, ook als er een productgroep met dezelfde naam bestaat. Onbekende groepsleden blokkeren.",
|
|
1047
|
+
rule: "gekoppeld_artikel_voor_groepsnaam",
|
|
1048
|
+
values: { moduleVersion: MODULE_VERSION, bufferId, beladingSources },
|
|
1049
|
+
})));
|
|
1050
|
+
}
|
|
1051
|
+
catch {
|
|
1052
|
+
// logboek is nooit sturend
|
|
1053
|
+
}
|
|
1034
1054
|
// Bestaande beladingen tellen en wissen.
|
|
1035
1055
|
const { data: existingCarts } = await sb
|
|
1036
1056
|
.from("order_carts")
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"moduleVersion.d.ts","sourceRoot":"","sources":["../../src/lib/moduleVersion.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,cAAc,WAAW,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flowselections/logistiek-engine",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.99",
|
|
4
4
|
"flowselections": {
|
|
5
5
|
"moduleId": "logistiek-engine",
|
|
6
6
|
"pages": [
|
|
@@ -96,6 +96,7 @@
|
|
|
96
96
|
"scripts": {
|
|
97
97
|
"dev": "vite dev",
|
|
98
98
|
"build": "vite build",
|
|
99
|
+
"prebuild:lib": "node -e \"const v=require('./package.json').version;require('fs').writeFileSync('src/lib/moduleVersion.ts','// Automatisch gegenereerd door prebuild:lib; niet handmatig aanpassen.\\nexport const MODULE_VERSION = '+JSON.stringify(v)+';\\n')\"",
|
|
99
100
|
"build:lib": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && node -e \"require('fs').writeFileSync('dist-lib/styles.css', '@source \\\"./\\\";\\n')\"",
|
|
100
101
|
"build:lib:watch": "tsc -p tsconfig.build.json --watch",
|
|
101
102
|
"build:dev": "vite build --mode development",
|