@flowselections/floriday-verkoop-module 1.0.130 → 1.0.132
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 +22 -4
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts +7 -0
- package/dist-lib/components/verkoop/EngineActieButtons.d.ts.map +1 -0
- package/dist-lib/components/verkoop/EngineActieButtons.js +22 -0
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts +3 -1
- package/dist-lib/components/verkoop/FloridayStageLine.d.ts.map +1 -1
- package/dist-lib/components/verkoop/FloridayStageLine.js +4 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts +4 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +17 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderLinePackingCard.js +22 -5
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +25 -2
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +23 -1
- package/dist-lib/integrations/supabase/types.d.ts +308 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/delivery-location.check.js +2 -1
- package/dist-lib/lib/floriday-line-key.check.js +19 -0
- package/dist-lib/lib/floriday-line-key.d.ts +20 -0
- package/dist-lib/lib/floriday-line-key.d.ts.map +1 -1
- package/dist-lib/lib/floriday-line-key.js +24 -0
- package/dist-lib/lib/floriday-mirror.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-mirror.server.js +50 -4
- package/dist-lib/lib/floriday-status.server.d.ts +1 -1
- package/dist-lib/lib/floriday-status.server.d.ts.map +1 -1
- package/dist-lib/lib/floriday-status.server.js +3 -3
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +1 -1
- package/dist-lib/lib/order-fust.check.d.ts +2 -0
- package/dist-lib/lib/order-fust.check.d.ts.map +1 -0
- package/dist-lib/lib/order-fust.check.js +19 -0
- package/dist-lib/lib/order-fust.d.ts +19 -0
- package/dist-lib/lib/order-fust.d.ts.map +1 -0
- package/dist-lib/lib/order-fust.js +21 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts +22 -0
- package/dist-lib/lib/order-item-packing.functions.d.ts.map +1 -1
- package/dist-lib/lib/order-item-packing.functions.js +29 -1
- package/dist-lib/lib/plan-coverage-v204.check.d.ts +2 -0
- package/dist-lib/lib/plan-coverage-v204.check.d.ts.map +1 -0
- package/dist-lib/lib/plan-coverage-v204.check.js +27 -0
- package/dist-lib/lib/plan-coverage.d.ts +30 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +57 -1
- package/dist-lib/lib/product-plannable.functions.d.ts +10 -0
- package/dist-lib/lib/product-plannable.functions.d.ts.map +1 -1
- package/dist-lib/lib/product-plannable.functions.js +60 -4
- package/dist-lib/lib/salesorders-list.functions.d.ts +17 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +23 -0
- package/dist-lib/lib/salesorders-list.server.d.ts +2 -0
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +41 -12
- package/dist-lib/lib/salesorders-mapping.d.ts +6 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders.functions.js +4 -8
- package/dist-lib/lib/useEngineMelding.d.ts +9 -0
- package/dist-lib/lib/useEngineMelding.d.ts.map +1 -0
- package/dist-lib/lib/useEngineMelding.js +20 -0
- package/package.json +1 -1
- package/schema/verkoop.sql +13 -2
|
@@ -4,10 +4,20 @@ export declare const getProductPlannability: import("@tanstack/start-client-core
|
|
|
4
4
|
claims: import("@supabase/auth-js").User;
|
|
5
5
|
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
6
6
|
productIds: string[];
|
|
7
|
+
regels?: {
|
|
8
|
+
key: string;
|
|
9
|
+
productId: string;
|
|
10
|
+
plantsPerCrate: number | null;
|
|
11
|
+
cratesPerLayer: number | null;
|
|
12
|
+
layersPerCart: number | null;
|
|
13
|
+
isDefault: boolean;
|
|
14
|
+
}[] | undefined;
|
|
7
15
|
}, Promise<{
|
|
8
16
|
impossible: Record<string, string>;
|
|
9
17
|
missing: Record<string, string>;
|
|
18
|
+
impossibleByLine: Record<string, string>;
|
|
10
19
|
available: boolean;
|
|
11
20
|
oordeelAvailable: boolean;
|
|
21
|
+
perLine: boolean;
|
|
12
22
|
}>>;
|
|
13
23
|
//# sourceMappingURL=product-plannable.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"product-plannable.functions.d.ts","sourceRoot":"","sources":["../../src/lib/product-plannable.functions.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,sBAAsB;;;;8CAET,OAAO;;;;;;;;;;;;;;;;;GA6E7B,CAAC"}
|
|
@@ -1,34 +1,90 @@
|
|
|
1
1
|
// Oordeel van de Logistiek Engine per product. Alleen lezen, nooit zelf beoordelen.
|
|
2
2
|
// - impossible: logistics_product_oordeel_many (Engine 1.0.201+), oordeel "onmogelijk".
|
|
3
3
|
// Ontbreekt die functie: geen waarschuwing.
|
|
4
|
+
// - impossibleByLine: logistics_product_oordeel_belading(p_regels) op de gekozen
|
|
5
|
+
// belading per regel; ontbreekt die, dan alleen het productoordeel voor regels
|
|
6
|
+
// met de standaardbelading (nooit een oordeel over de standaard bij een andere keuze).
|
|
4
7
|
// - missing: ontbrekende gegevens via logistics_product_maten.missing_reason.
|
|
5
8
|
import { createServerFn } from "@tanstack/react-start";
|
|
6
9
|
import { z } from "zod";
|
|
7
10
|
import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
|
|
8
11
|
export const getProductPlannability = createServerFn({ method: "POST" })
|
|
9
12
|
.middleware([requireSupabaseAuth])
|
|
10
|
-
.inputValidator((input) => z
|
|
13
|
+
.inputValidator((input) => z
|
|
14
|
+
.object({
|
|
15
|
+
productIds: z.array(z.string().uuid()).max(200),
|
|
16
|
+
/** Gekozen belading per regel; isDefault = gelijk aan de standaard van het product. */
|
|
17
|
+
regels: z
|
|
18
|
+
.array(z.object({
|
|
19
|
+
key: z.string().min(1).max(50),
|
|
20
|
+
productId: z.string().uuid(),
|
|
21
|
+
plantsPerCrate: z.number().int().positive().nullable(),
|
|
22
|
+
cratesPerLayer: z.number().int().positive().nullable(),
|
|
23
|
+
layersPerCart: z.number().int().positive().nullable(),
|
|
24
|
+
isDefault: z.boolean(),
|
|
25
|
+
}))
|
|
26
|
+
.max(200)
|
|
27
|
+
.optional(),
|
|
28
|
+
})
|
|
29
|
+
.parse(input))
|
|
11
30
|
.handler(async ({ data, context }) => {
|
|
12
31
|
const impossible = {};
|
|
13
32
|
const missing = {};
|
|
33
|
+
/** Oordeel per regel (sleutel = regels[].key). */
|
|
34
|
+
const impossibleByLine = {};
|
|
14
35
|
if (!data.productIds.length)
|
|
15
|
-
return { impossible, missing, available: true, oordeelAvailable: true };
|
|
36
|
+
return { impossible, missing, impossibleByLine, available: true, oordeelAvailable: true, perLine: false };
|
|
16
37
|
const sb = context.supabase;
|
|
17
|
-
const
|
|
38
|
+
const regels = data.regels ?? [];
|
|
39
|
+
const [oordeel, maten, perRegel] = await Promise.all([
|
|
18
40
|
sb.rpc("logistics_product_oordeel_many", { p_product_ids: data.productIds }),
|
|
19
41
|
sb.rpc("logistics_product_maten", { p_product_ids: data.productIds }),
|
|
42
|
+
regels.length
|
|
43
|
+
? sb.rpc("logistics_product_oordeel_belading", {
|
|
44
|
+
p_regels: regels.map((r) => ({
|
|
45
|
+
product_id: r.productId,
|
|
46
|
+
plants_per_crate: r.plantsPerCrate,
|
|
47
|
+
crates_per_layer: r.cratesPerLayer,
|
|
48
|
+
layers_per_cart: r.layersPerCart,
|
|
49
|
+
})),
|
|
50
|
+
})
|
|
51
|
+
: Promise.resolve({ data: null, error: { code: "SKIP" } }),
|
|
20
52
|
]);
|
|
53
|
+
// Engine met oordeel op de gekozen belading: dat is leidend.
|
|
54
|
+
const perLine = !perRegel.error;
|
|
55
|
+
if (perLine) {
|
|
56
|
+
// Uitvoer [{product_id, oordeel, tekst, regels[]}] in dezelfde volgorde als de invoer.
|
|
57
|
+
const out = (Array.isArray(perRegel.data) ? perRegel.data : []);
|
|
58
|
+
out.forEach((r, i) => {
|
|
59
|
+
const regel = regels[i];
|
|
60
|
+
if (!regel || String(r?.product_id ?? "") !== regel.productId)
|
|
61
|
+
return;
|
|
62
|
+
if (String(r?.oordeel ?? "").toLowerCase() !== "onmogelijk")
|
|
63
|
+
return;
|
|
64
|
+
const tekst = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "De Engine noemt deze belading onmogelijk.";
|
|
65
|
+
const extra = Array.isArray(r.regels) ? r.regels.filter((x) => typeof x === "string" && x.trim()) : [];
|
|
66
|
+
impossibleByLine[regel.key] = extra.length ? `${tekst} — ${extra.join("; ")}` : tekst;
|
|
67
|
+
});
|
|
68
|
+
}
|
|
21
69
|
if (!oordeel.error) {
|
|
22
70
|
for (const r of (oordeel.data ?? [])) {
|
|
23
71
|
if (r?.product_id && String(r.oordeel ?? "").toLowerCase() === "onmogelijk")
|
|
24
72
|
impossible[String(r.product_id)] = typeof r.tekst === "string" && r.tekst.trim() ? r.tekst.trim() : "De Engine noemt dit product onmogelijk.";
|
|
25
73
|
}
|
|
26
74
|
}
|
|
75
|
+
// Terugval (oudere Engine): het productoordeel gaat over de standaardbelading
|
|
76
|
+
// van het artikel en geldt daarom alleen voor regels die die standaard gebruiken.
|
|
77
|
+
if (!perLine) {
|
|
78
|
+
for (const r of regels) {
|
|
79
|
+
if (r.isDefault && impossible[r.productId])
|
|
80
|
+
impossibleByLine[r.key] = impossible[r.productId];
|
|
81
|
+
}
|
|
82
|
+
}
|
|
27
83
|
if (!maten.error) {
|
|
28
84
|
for (const r of (maten.data ?? [])) {
|
|
29
85
|
if (r?.product_id && typeof r.missing_reason === "string" && r.missing_reason.trim())
|
|
30
86
|
missing[String(r.product_id)] = r.missing_reason.trim();
|
|
31
87
|
}
|
|
32
88
|
}
|
|
33
|
-
return { impossible, missing, available: !maten.error, oordeelAvailable: !oordeel.error };
|
|
89
|
+
return { impossible, missing, impossibleByLine, available: !maten.error, oordeelAvailable: !oordeel.error, perLine };
|
|
34
90
|
});
|
|
@@ -27,4 +27,21 @@ export declare const getLocalSalesOrderDetail: import("@tanstack/start-client-co
|
|
|
27
27
|
sellerFallback: string | null;
|
|
28
28
|
environment: "staging" | "live";
|
|
29
29
|
}>>;
|
|
30
|
+
/**
|
|
31
|
+
* Floriday-stand voor de zichtbare lijstrijen, los van de lijst geladen zodat
|
|
32
|
+
* de lijst er nooit op wacht. Alleen weergave; fail closed per rij.
|
|
33
|
+
*/
|
|
34
|
+
export declare const getFloridayStatusesForRows: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
|
|
35
|
+
supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
|
|
36
|
+
userId: string;
|
|
37
|
+
claims: import("@supabase/auth-js").User;
|
|
38
|
+
}, undefined, undefined, undefined>], (input: unknown) => {
|
|
39
|
+
rows: {
|
|
40
|
+
key: string;
|
|
41
|
+
ids: string[];
|
|
42
|
+
}[];
|
|
43
|
+
}, Promise<{
|
|
44
|
+
statuses: Record<string, import("./floriday-status.js").FloridayStatusSummary>;
|
|
45
|
+
error: string | null;
|
|
46
|
+
}>>;
|
|
30
47
|
//# sourceMappingURL=salesorders-list.functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AAwDA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;GA+B7B,CAAC"}
|
|
1
|
+
{"version":3,"file":"salesorders-list.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.functions.ts"],"names":[],"mappings":"AAwDA,eAAO,MAAM,eAAe;;;;8CAEF,OAAO;;;;;;;;;;;2DAQ7B,CAAC;AAML,eAAO,MAAM,wBAAwB;;;;8CAEX,OAAO;;;;;;;;GA+B7B,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;8CAEb,OAAO;;;;;;;;GAiB7B,CAAC"}
|
|
@@ -95,3 +95,26 @@ export const getLocalSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
95
95
|
environment: result.environment,
|
|
96
96
|
};
|
|
97
97
|
});
|
|
98
|
+
/**
|
|
99
|
+
* Floriday-stand voor de zichtbare lijstrijen, los van de lijst geladen zodat
|
|
100
|
+
* de lijst er nooit op wacht. Alleen weergave; fail closed per rij.
|
|
101
|
+
*/
|
|
102
|
+
export const getFloridayStatusesForRows = createServerFn({ method: "POST" })
|
|
103
|
+
.middleware([requireSupabaseAuth])
|
|
104
|
+
.inputValidator((input) => z
|
|
105
|
+
.object({
|
|
106
|
+
rows: z
|
|
107
|
+
.array(z.object({ key: z.string().min(1).max(200), ids: z.array(z.string().min(1).max(100)).max(100) }))
|
|
108
|
+
.max(200),
|
|
109
|
+
})
|
|
110
|
+
.parse(input))
|
|
111
|
+
.handler(async ({ data }) => {
|
|
112
|
+
const { loadFloridayStatuses } = await import("./floriday-status.server.js");
|
|
113
|
+
const { summarizeFloridayStatus } = await import("./salesorders-list.server.js");
|
|
114
|
+
const all = Array.from(new Set(data.rows.flatMap((r) => r.ids))).slice(0, 200);
|
|
115
|
+
const res = await loadFloridayStatuses(all, 8000);
|
|
116
|
+
const out = {};
|
|
117
|
+
for (const r of data.rows)
|
|
118
|
+
out[r.key] = summarizeFloridayStatus(r.ids, res.entries, res.error);
|
|
119
|
+
return { statuses: out, error: res.error };
|
|
120
|
+
});
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { SupabaseClient } from "@supabase/supabase-js";
|
|
2
2
|
import { type SalesOrderDTO, type SalesOrdersTotals } from "./salesorders-mapping.js";
|
|
3
|
+
import { type FloridayStatusEntry, type FloridayStatusSummary } from "./floriday-status.js";
|
|
3
4
|
import { type OrderStage } from "./order-status.js";
|
|
4
5
|
/** "backlog" is géén status: het is een aparte weergave van "Te picken". */
|
|
5
6
|
export type StatusTab = "all" | OrderStage | "backlog" | "not_reported";
|
|
@@ -49,4 +50,5 @@ export declare function overviewWindowFor(deliveries: (string | null)[]): {
|
|
|
49
50
|
to: string | null;
|
|
50
51
|
};
|
|
51
52
|
export declare function buildSalesOrdersList(supabase: SupabaseClient, params: ListParams, connectionSupabase?: SupabaseClient): Promise<ListResult>;
|
|
53
|
+
export declare function summarizeFloridayStatus(ids: string[], entries: Map<string, FloridayStatusEntry>, error: string | null): FloridayStatusSummary;
|
|
52
54
|
//# sourceMappingURL=salesorders-list.server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"salesorders-list.server.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-list.server.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEvB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAiB,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGxG,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIjF,4EAA4E;AAC5E,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,CAAC;AAExE,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAqHD,wBAAgB,wBAAwB,SAIvC;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACvC;AAoDD;+EAC+E;AAC/E,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgB3G;AA8BD,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,UAAU,EAClB,kBAAkB,GAAE,cAAyB,GAC5C,OAAO,CAAC,UAAU,CAAC,CAmtCrB;AA0DD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACzC,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,qBAAqB,CAIvB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { loadReviewDismissals, isReviewDismissed } from "./review-dismissals.server.js";
|
|
2
|
+
import { orderFust } from "./order-fust.js";
|
|
2
3
|
import { posOrNull } from "./packing-snapshot.js";
|
|
3
4
|
import { customerDisplayName } from "./customer-name.js";
|
|
4
5
|
import { isNotReportedLocally } from "./floriday-status.js";
|
|
@@ -302,7 +303,7 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
302
303
|
return { environment, sellerFallback, foRows, truncated };
|
|
303
304
|
});
|
|
304
305
|
// 3) Lokale orders binnen hetzelfde venster.
|
|
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))";
|
|
306
|
+
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, plants_per_crate, crates_per_layer, layers_per_cart, products(plants_per_crate, crates_per_layer, layers_per_cart, floriday_trade_item_id, custom_fields))";
|
|
306
307
|
const localTask = t.time("3_lokaal", async () => {
|
|
307
308
|
if (params.localOrderId) {
|
|
308
309
|
const primaryRes = await supabase
|
|
@@ -765,7 +766,15 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
765
766
|
// Geen eigen karrentelling: het aantal karren komt alleen uit de Engine.
|
|
766
767
|
void karTotalRaw;
|
|
767
768
|
const karCount = 0;
|
|
768
|
-
|
|
769
|
+
// Fust = som per regel met de regelbelading (zoals de Engine); zie order-fust.ts.
|
|
770
|
+
const fustSummary = orderFust(lineItems.map((it) => ({
|
|
771
|
+
pieces: toNumber(it?.quantity) || 0,
|
|
772
|
+
line: it,
|
|
773
|
+
product: it?.products ?? null,
|
|
774
|
+
articleKey: String(it?.product_id ?? it?.product_name ?? ""),
|
|
775
|
+
})));
|
|
776
|
+
void fustTotal;
|
|
777
|
+
const fustCount = fustSummary.fust > 0 ? fustSummary.fust : totalQuantity;
|
|
769
778
|
const unitPrice = firstLine ? toNumber(firstLine.unit_price) : total;
|
|
770
779
|
const rawOrderDate = r.order_date ?? "";
|
|
771
780
|
const orderedAt = typeof rawOrderDate === "string" && rawOrderDate.includes("T")
|
|
@@ -810,6 +819,8 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
810
819
|
revenue: total,
|
|
811
820
|
fustCount,
|
|
812
821
|
karCount,
|
|
822
|
+
mixedPacking: fustSummary.mixed,
|
|
823
|
+
articleCount: fustSummary.articleCount,
|
|
813
824
|
crateTypeName: mergeTypeNames(crateNames),
|
|
814
825
|
cartTypeName: mergeTypeNames(cartNames),
|
|
815
826
|
loadCarrierType: normalizeLoadCarrierCode(cf.load_carrier_type),
|
|
@@ -987,10 +998,13 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
987
998
|
const karUnknown = members.some((m) => m.karUnknown);
|
|
988
999
|
const totalPieces = members.reduce((s, m) => s + (m.totalPieces ?? 0), 0);
|
|
989
1000
|
const incomplete = Array.from(new Set(members.flatMap((m) => m.incomplete ?? [])));
|
|
1001
|
+
const articleCount = members.reduce((s, m) => s + (m.articleCount ?? 1), 0);
|
|
990
1002
|
return {
|
|
991
1003
|
...head,
|
|
992
1004
|
revenue,
|
|
993
1005
|
fustCount,
|
|
1006
|
+
mixedPacking: members.some((m) => m.mixedPacking) || articleCount > 1,
|
|
1007
|
+
articleCount,
|
|
994
1008
|
karCount,
|
|
995
1009
|
karShared,
|
|
996
1010
|
karUnknown,
|
|
@@ -1284,15 +1298,24 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1284
1298
|
}));
|
|
1285
1299
|
}
|
|
1286
1300
|
}
|
|
1287
|
-
// 15) Floriday-stand uit het statusoverzicht (alleen weergave)
|
|
1288
|
-
//
|
|
1289
|
-
|
|
1301
|
+
// 15) Floriday-stand uit het statusoverzicht (alleen weergave). In de lijst
|
|
1302
|
+
// wordt hij NIET meer afgewacht: alleen de ids gaan mee (floridayStatusIds)
|
|
1303
|
+
// en het scherm laadt de stand los na (getFloridayStatusesForRows).
|
|
1304
|
+
// Alleen het detailscherm wacht er nog op. Fail closed: "stand onbekend".
|
|
1305
|
+
const idsOf = (o) => o.floridayIds && o.floridayIds.length
|
|
1306
|
+
? o.floridayIds
|
|
1307
|
+
: !o.id.startsWith("local:") && !o.id.startsWith("mailbox-proposal:") && /^[0-9a-f-]{36}$/i.test(o.id) && !o.isLocal
|
|
1308
|
+
? [o.id]
|
|
1309
|
+
: [];
|
|
1310
|
+
if (!params.all && !params.localOrderId) {
|
|
1311
|
+
for (const o of pageGroups.flat()) {
|
|
1312
|
+
const ids = idsOf(o);
|
|
1313
|
+
if (ids.length)
|
|
1314
|
+
o.floridayStatusIds = ids;
|
|
1315
|
+
}
|
|
1316
|
+
}
|
|
1317
|
+
if (!params.all && params.localOrderId) {
|
|
1290
1318
|
const visible = pageGroups.flat();
|
|
1291
|
-
const idsOf = (o) => o.floridayIds && o.floridayIds.length
|
|
1292
|
-
? o.floridayIds
|
|
1293
|
-
: !o.id.startsWith("local:") && !o.id.startsWith("mailbox-proposal:") && /^[0-9a-f-]{36}$/i.test(o.id) && !o.isLocal
|
|
1294
|
-
? [o.id]
|
|
1295
|
-
: [];
|
|
1296
1319
|
const allIds = Array.from(new Set(visible.flatMap(idsOf))).slice(0, 100);
|
|
1297
1320
|
if (allIds.length) {
|
|
1298
1321
|
enrichTasks.push(t.time("15_floriday_stand", async () => {
|
|
@@ -1311,7 +1334,13 @@ export async function buildSalesOrdersList(supabase, params, connectionSupabase
|
|
|
1311
1334
|
}
|
|
1312
1335
|
await Promise.all(enrichTasks);
|
|
1313
1336
|
t.mark("14_15_verrijking");
|
|
1314
|
-
const rows = pageGroups.map(
|
|
1337
|
+
const rows = pageGroups.map((g) => {
|
|
1338
|
+
const row = mergeGroup(g);
|
|
1339
|
+
const ids = Array.from(new Set(g.flatMap((m) => m.floridayStatusIds ?? [])));
|
|
1340
|
+
if (ids.length)
|
|
1341
|
+
row.floridayStatusIds = ids;
|
|
1342
|
+
return row;
|
|
1343
|
+
});
|
|
1315
1344
|
// Totalen over de volledige gefilterde set (alle orders in elke buffer).
|
|
1316
1345
|
const totals = computeTotals(filteredGroups.map(mergeGroup));
|
|
1317
1346
|
t.mark("16_samenvoegen");
|
|
@@ -1386,7 +1415,7 @@ async function loadGroupPackingUncached(supabase) {
|
|
|
1386
1415
|
}
|
|
1387
1416
|
return byName;
|
|
1388
1417
|
}
|
|
1389
|
-
function summarizeFloridayStatus(ids, entries, error) {
|
|
1418
|
+
export function summarizeFloridayStatus(ids, entries, error) {
|
|
1390
1419
|
const found = ids.map((id) => entries.get(id)).filter((e) => !!e);
|
|
1391
1420
|
if (found.length === 0)
|
|
1392
1421
|
return { stage: "onbekend", error: error ?? "geen antwoord", entries: [] };
|
|
@@ -15,6 +15,10 @@ export interface SalesOrderDTO {
|
|
|
15
15
|
revenue: number;
|
|
16
16
|
fustCount: number;
|
|
17
17
|
karCount: number;
|
|
18
|
+
/** Meerdere artikelen of beladingen op één order: kop toont "Gemengd (N artikelen)". */
|
|
19
|
+
mixedPacking?: boolean;
|
|
20
|
+
/** Aantal verschillende artikelen op de order. */
|
|
21
|
+
articleCount?: number;
|
|
18
22
|
/** Type fust (bijv. "VBN 101" of de Floricode-omschrijving). */
|
|
19
23
|
crateTypeName?: string | null;
|
|
20
24
|
/** Type ladingdrager / kar (bijv. "Deense container"). */
|
|
@@ -108,6 +112,8 @@ export interface SalesOrderDTO {
|
|
|
108
112
|
floridayIds?: string[];
|
|
109
113
|
/** Floriday-stand uit het statusoverzicht; alleen weergave. */
|
|
110
114
|
floridayStatus?: import("./floriday-status.js").FloridayStatusSummary | null;
|
|
115
|
+
/** Lijst: ids waarvoor het scherm de Floriday-stand los nalaadt. */
|
|
116
|
+
floridayStatusIds?: string[];
|
|
111
117
|
/** Actieve orderregels: stuks en prijs per stuk (voor de totaalregel). */
|
|
112
118
|
priceLines?: {
|
|
113
119
|
pieces: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"salesorders-mapping.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAgC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;
|
|
1
|
+
{"version":3,"file":"salesorders.functions.d.ts","sourceRoot":"","sources":["../../src/lib/salesorders.functions.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,uBAAuB,CAAC;AAgC/B,eAAO,MAAM,kBAAkB;;;;;;;;GAK3B,CAAC;AA6BL,eAAO,MAAM,gBAAgB;;;;6CAEJ,OAAO;;;;;;;;;;;;;GAmC5B,CAAC;AAGL,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDnC,CAAC;AASL,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;0CAEV,OAAO;;mCAgazB,CAAC;AAQL,eAAO,MAAM,uBAAuB;;;;0CAEd,OAAO;;;;;GAQzB,CAAC;AAOL,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,qBAAqB;;;;6EA4E9B,CAAC"}
|
|
@@ -376,14 +376,10 @@ export const getSalesOrderDetail = createServerFn({ method: "POST" })
|
|
|
376
376
|
// Floriday-stand (alleen weergave), voor alle bestellingen op deze order.
|
|
377
377
|
{
|
|
378
378
|
const foIds = Array.from(new Set([String(data.id), ...activeItems.map((it) => String(it?.source_line_key ?? ""))].filter((v) => /^[0-9a-f-]{36}$/i.test(v)))).slice(0, 100);
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
dto.floridayStatus =
|
|
384
|
-
found.length > 0
|
|
385
|
-
? { stage: combineStages(found.map((e) => e.floridayStage)), error: null, entries: found }
|
|
386
|
-
: { stage: "onbekend", error: res.error ?? "geen antwoord", entries: [] };
|
|
379
|
+
// Niet meer afwachten (grens 0,8 s gaf "stand onbekend"): het scherm laadt
|
|
380
|
+
// de stand los na via getFloridayStatusesForRows, net als de lijst.
|
|
381
|
+
if (foIds.length)
|
|
382
|
+
dto.floridayStatusIds = foIds;
|
|
387
383
|
}
|
|
388
384
|
if (bufferId) {
|
|
389
385
|
dto.bufferId = bufferId;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { EngineActie } from "./plan-coverage.js";
|
|
2
|
+
export interface EngineMelding {
|
|
3
|
+
tekst: string;
|
|
4
|
+
/** Alleen acties die de Engine meegaf. */
|
|
5
|
+
acties: EngineActie[];
|
|
6
|
+
}
|
|
7
|
+
export declare function useEngineMelding(orderId: string | null | undefined): EngineMelding | null;
|
|
8
|
+
export declare function useSetEngineMelding(orderId: string | null | undefined): (m: EngineMelding | null) => unknown;
|
|
9
|
+
//# sourceMappingURL=useEngineMelding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useEngineMelding.d.ts","sourceRoot":"","sources":["../../src/lib/useEngineMelding.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAKD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,aAAa,GAAG,IAAI,CASzF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,IAE5D,GAAG,aAAa,GAAG,IAAI,aAChC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// Laatste melding van de Engine bij vastzetten (karren liggen al vast), gedeeld
|
|
2
|
+
// tussen de beladingkaart en de karindeling-kaart via de querycache. Alleen
|
|
3
|
+
// weergave; nooit opgeslagen in de order.
|
|
4
|
+
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
|
5
|
+
const norm = (id) => String(id ?? "").replace(/^(local:|mailbox-proposal:)/, "");
|
|
6
|
+
const key = (id) => ["engine-melding", norm(id)];
|
|
7
|
+
export function useEngineMelding(orderId) {
|
|
8
|
+
const { data } = useQuery({
|
|
9
|
+
queryKey: key(orderId),
|
|
10
|
+
queryFn: () => null,
|
|
11
|
+
enabled: false,
|
|
12
|
+
staleTime: Infinity,
|
|
13
|
+
gcTime: Infinity,
|
|
14
|
+
});
|
|
15
|
+
return data ?? null;
|
|
16
|
+
}
|
|
17
|
+
export function useSetEngineMelding(orderId) {
|
|
18
|
+
const qc = useQueryClient();
|
|
19
|
+
return (m) => qc.setQueryData(key(orderId), m);
|
|
20
|
+
}
|
package/package.json
CHANGED
package/schema/verkoop.sql
CHANGED
|
@@ -3053,11 +3053,11 @@ END $function$;
|
|
|
3053
3053
|
CREATE OR REPLACE FUNCTION public.verkoop_health_checks()
|
|
3054
3054
|
RETURNS TABLE(naam text, ok boolean, opm text)
|
|
3055
3055
|
LANGUAGE plpgsql
|
|
3056
|
-
|
|
3056
|
+
SECURITY DEFINER
|
|
3057
3057
|
SET search_path TO 'public'
|
|
3058
3058
|
AS $function$
|
|
3059
3059
|
DECLARE v_bad integer; v_cnt integer; v_idx integer; v_has_cache boolean := to_regclass('public.floriday_fulfillment_orders_cache') IS NOT NULL;
|
|
3060
|
-
v_status jsonb; v_ok boolean; j record; v_trg integer;
|
|
3060
|
+
v_status jsonb; v_ok boolean; j record; v_trg integer; v_unl integer; v_dup integer;
|
|
3061
3061
|
BEGIN
|
|
3062
3062
|
IF NOT public.verkoop_is_server() THEN
|
|
3063
3063
|
PERFORM public.verkoop_assert_caller('rol', '{admin,superadmin}'::public.app_role[]);
|
|
@@ -3085,6 +3085,17 @@ BEGIN
|
|
|
3085
3085
|
WHEN v_trg < 2 THEN 'nee (triggers op floriday_salesorders_cache ontbreken); de minuutronde vangt de orders op'
|
|
3086
3086
|
WHEN NOT v_ok THEN 'nee (' || (v_status->>'reden') || '); de minuutronde vangt de orders op'
|
|
3087
3087
|
ELSE 'ja' END;
|
|
3088
|
+
-- Orderregels zonder Floriday-koppeling op Floriday-orders (restant oude overname).
|
|
3089
|
+
SELECT count(*)::int,
|
|
3090
|
+
count(*) FILTER (WHERE EXISTS (SELECT 1 FROM public.order_items k WHERE k.order_id = oi.order_id
|
|
3091
|
+
AND k.source_line_key IS NOT NULL AND k.quarantined_at IS NULL
|
|
3092
|
+
AND k.product_id IS NOT DISTINCT FROM oi.product_id))::int
|
|
3093
|
+
INTO v_unl, v_dup
|
|
3094
|
+
FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
|
|
3095
|
+
WHERE o.floriday_sales_order_id IS NOT NULL AND oi.source_line_key IS NULL AND oi.quarantined_at IS NULL;
|
|
3096
|
+
RETURN QUERY SELECT 'Verkoop: orderregels zonder Floriday-koppeling'::text, v_unl = 0,
|
|
3097
|
+
CASE WHEN v_unl = 0 THEN 'ok: 0'
|
|
3098
|
+
ELSE format('%s regel(s) zonder koppeling op Floriday-orders, waarvan %s met een gekoppelde tegenhanger (dubbel geteld in lijst en karindeling); opruimen alleen na akkoord per shell', v_unl, v_dup) END;
|
|
3088
3099
|
IF NOT v_has_cache THEN
|
|
3089
3100
|
RETURN QUERY SELECT 'Verkoop: geen volledige cache-scan per minuut'::text, true, 'geen Floriday-afhandelingen in deze shell'::text;
|
|
3090
3101
|
ELSE
|