@flowselections/pick-schermen-kwekers 1.0.34 → 1.0.36
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/README.md +0 -1
- package/dist-lib/components/pick/PickScherm.d.ts.map +1 -1
- package/dist-lib/components/pick/PickScherm.js +6 -1
- package/dist-lib/components/pick/QueueTable.d.ts.map +1 -1
- package/dist-lib/components/pick/QueueTable.js +14 -1
- package/dist-lib/integrations/supabase/types.d.ts +44 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/__tests__/pickSentElsewhere.test.d.ts +2 -0
- package/dist-lib/lib/__tests__/pickSentElsewhere.test.d.ts.map +1 -0
- package/dist-lib/lib/__tests__/pickSentElsewhere.test.js +30 -0
- package/dist-lib/lib/pickApi.d.ts +12 -0
- package/dist-lib/lib/pickApi.d.ts.map +1 -1
- package/dist-lib/lib/pickApi.js +16 -0
- package/dist-lib/lib/pickCartResults.d.ts +6 -1
- package/dist-lib/lib/pickCartResults.d.ts.map +1 -1
- package/dist-lib/lib/pickCartResults.js +24 -0
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pickSentElsewhere.test.d.ts","sourceRoot":"","sources":["../../../src/lib/__tests__/pickSentElsewhere.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
vi.mock("@flowselections/core", () => ({ supabase: {} }));
|
|
3
|
+
import { parseSentElsewhere } from "../pickApi";
|
|
4
|
+
import { resultsFromBatch, sentElsewhereMessage, summarizeCartResults, trackableJobs, resettableJobs } from "../pickCartResults";
|
|
5
|
+
const cart = (id, n) => ({ cartId: id, cartIndex: n, cartTotal: 1, cartLabel: `K${n}`, isFullCart: true, slipVariant: "full_cart", barcode: "LC1", isShared: false, items: [] });
|
|
6
|
+
const raw = { jobId: "j9", origin: "elders", printerName: "Zebra hal 1", sentAt: "2026-10-14T09:43:20Z", barcode: "LC1", ownBarcode: "LC1", barcodeMismatch: false };
|
|
7
|
+
describe("pakbon al elders verstuurd", () => {
|
|
8
|
+
it("melding met herkomst, printer en tijd", () => {
|
|
9
|
+
const e = parseSentElsewhere(raw);
|
|
10
|
+
expect(sentElsewhereMessage(e)).toMatch(/^Pakbon al verstuurd vanuit elders naar Zebra hal 1 om \d{2}:\d{2}$/);
|
|
11
|
+
});
|
|
12
|
+
it("geen nieuwe opdracht, niets volgen of terugzetten", () => {
|
|
13
|
+
const r = resultsFromBatch([cart("c1", 1)], [
|
|
14
|
+
{ cartId: "c1", cartLabel: "K1", jobId: null, status: "sent_elsewhere", message: "x", elsewhere: parseSentElsewhere(raw) },
|
|
15
|
+
], []);
|
|
16
|
+
expect(r[0].outcome).toBe("not_created");
|
|
17
|
+
expect(r[0].sentElsewhere?.jobId).toBe("j9");
|
|
18
|
+
expect(r[0].reason).toMatch(/^Pakbon al verstuurd vanuit elders/);
|
|
19
|
+
expect(trackableJobs(r)).toEqual([]);
|
|
20
|
+
expect(resettableJobs(trackableJobs(r))).toEqual([]);
|
|
21
|
+
expect(summarizeCartResults(r).title).toMatch(/^K1 — Pakbon al verstuurd/);
|
|
22
|
+
});
|
|
23
|
+
it("andere barcode wordt zichtbaar gemeld", () => {
|
|
24
|
+
const e = parseSentElsewhere({ ...raw, ownBarcode: "LC2", barcodeMismatch: true });
|
|
25
|
+
expect(sentElsewhereMessage(e)).toContain("andere kar-barcode LC1 dan LC2");
|
|
26
|
+
});
|
|
27
|
+
it("zonder herkomst: elders", () => {
|
|
28
|
+
expect(parseSentElsewhere({ printerName: "P" }).origin).toBe("elders");
|
|
29
|
+
});
|
|
30
|
+
});
|
|
@@ -44,7 +44,19 @@ export interface PickBatchCartResult {
|
|
|
44
44
|
/** created | not_created | already_printed; null bij een oudere database. */
|
|
45
45
|
status?: string | null;
|
|
46
46
|
message?: string | null;
|
|
47
|
+
/** Bij status sent_elsewhere: waar en wanneer de pakbon al is verstuurd. */
|
|
48
|
+
elsewhere?: SentElsewhere | null;
|
|
47
49
|
}
|
|
50
|
+
export interface SentElsewhere {
|
|
51
|
+
jobId: string | null;
|
|
52
|
+
origin: string;
|
|
53
|
+
printerName: string;
|
|
54
|
+
sentAt: string | null;
|
|
55
|
+
barcode: string | null;
|
|
56
|
+
ownBarcode: string | null;
|
|
57
|
+
barcodeMismatch: boolean;
|
|
58
|
+
}
|
|
59
|
+
export declare function parseSentElsewhere(raw: unknown): SentElsewhere | null;
|
|
48
60
|
export interface PickBatchPrintResult {
|
|
49
61
|
item: PickQueueItem;
|
|
50
62
|
jobs: PickBatchPrintJob[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pickApi.d.ts","sourceRoot":"","sources":["../../src/lib/pickApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,uBAAuB,EACvB,WAAW,EAEX,aAAa,EACb,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,UAAU,EACV,QAAQ,EACT,MAAM,aAAa,CAAC;AAMrB,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IACzB,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IACxF,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;IAC/B,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,IAAI,EAAE,OAAO,QAAQ,CAAC,IAAI,CAAC;CAC5B,CAAC;AAGF,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAUjE;AACD,QAAA,MAAM,EAAE,cAAwB,CAAC;AAEjC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;AAExB,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAYD,sEAAsE;AACtE,wBAAsB,cAAc,CAClC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,EACjC,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GACzC,OAAO,CAAC,WAAW,EAAE,CAAC,CAgBxB;AAOD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,uEAAuE;IACvE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pickApi.d.ts","sourceRoot":"","sources":["../../src/lib/pickApi.ts"],"names":[],"mappings":"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"}
|
package/dist-lib/lib/pickApi.js
CHANGED
|
@@ -51,6 +51,21 @@ function unwrap(res) {
|
|
|
51
51
|
throw new Error(res.error.message);
|
|
52
52
|
return safeArray(res.data);
|
|
53
53
|
}
|
|
54
|
+
export function parseSentElsewhere(raw) {
|
|
55
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw))
|
|
56
|
+
return null;
|
|
57
|
+
const r = raw;
|
|
58
|
+
const str = (v) => (typeof v === "string" && v ? v : null);
|
|
59
|
+
return {
|
|
60
|
+
jobId: str(r["jobId"]),
|
|
61
|
+
origin: str(r["origin"]) ?? "elders",
|
|
62
|
+
printerName: str(r["printerName"]) ?? "onbekende printer",
|
|
63
|
+
sentAt: str(r["sentAt"]),
|
|
64
|
+
barcode: str(r["barcode"]),
|
|
65
|
+
ownBarcode: str(r["ownBarcode"]),
|
|
66
|
+
barcodeMismatch: r["barcodeMismatch"] === true,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
54
69
|
function parseBatchPrintResult(value) {
|
|
55
70
|
if (!value || typeof value !== "object")
|
|
56
71
|
throw new Error("De batchprint gaf geen resultaat terug.");
|
|
@@ -70,6 +85,7 @@ function parseBatchPrintResult(value) {
|
|
|
70
85
|
cartLabel: typeof job["cartLabel"] === "string" ? job["cartLabel"] : null,
|
|
71
86
|
status: typeof job["status"] === "string" ? job["status"] : null,
|
|
72
87
|
message: typeof job["message"] === "string" && job["message"] ? job["message"] : null,
|
|
88
|
+
elsewhere: parseSentElsewhere(job["elsewhere"]),
|
|
73
89
|
}];
|
|
74
90
|
});
|
|
75
91
|
const jobs = carts.flatMap((c) => (c.jobId ? [{ cartId: c.cartId, cartLabel: c.cartLabel, jobId: c.jobId }] : []));
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { PickBatchPrintJob } from "./pickApi";
|
|
1
|
+
import type { PickBatchPrintJob, SentElsewhere } from "./pickApi";
|
|
2
2
|
import type { PickCart, PickCartPlan, PickQueueItem } from "./pickTypes";
|
|
3
3
|
import { printedCartIdsOf } from "./pickTypes";
|
|
4
4
|
export type CartPrintOutcome = "created" | "not_created" | "error";
|
|
@@ -9,7 +9,11 @@ export interface CartPrintResult {
|
|
|
9
9
|
jobId: string | null;
|
|
10
10
|
reprint: boolean;
|
|
11
11
|
reason: string | null;
|
|
12
|
+
/** Pakbon voor deze kar is al elders verstuurd; geen nieuwe opdracht. */
|
|
13
|
+
sentElsewhere?: SentElsewhere | null;
|
|
12
14
|
}
|
|
15
|
+
/** "Pakbon al verstuurd vanuit <herkomst> naar <printer> om <tijd>" (tijd in lokale tijd). */
|
|
16
|
+
export declare function sentElsewhereMessage(e: SentElsewhere): string;
|
|
13
17
|
export declare const CART_MISSING_MESSAGE = "De kar van deze rij bestaat niet meer in het karplan; ververs de pickwachtrij";
|
|
14
18
|
export declare class CartMissingError extends Error {
|
|
15
19
|
constructor();
|
|
@@ -32,6 +36,7 @@ export declare function resultsFromBatch(requested: PickCart[], jobs: Array<{
|
|
|
32
36
|
cartLabel: string | null;
|
|
33
37
|
status?: string | null;
|
|
34
38
|
message?: string | null;
|
|
39
|
+
elsewhere?: SentElsewhere | null;
|
|
35
40
|
}>, alreadyPrinted: string[]): CartPrintResult[];
|
|
36
41
|
/** Alle karren al geprint: geen opdracht, per kar "al geprint; kies Herprint". */
|
|
37
42
|
export declare function alreadyPrintedResults(carts: PickCart[]): CartPrintResult[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pickCartResults.d.ts","sourceRoot":"","sources":["../../src/lib/pickCartResults.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"pickCartResults.d.ts","sourceRoot":"","sources":["../../src/lib/pickCartResults.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
import { cartRowOf, printedCartIdsOf } from "./pickTypes";
|
|
2
|
+
/** "Pakbon al verstuurd vanuit <herkomst> naar <printer> om <tijd>" (tijd in lokale tijd). */
|
|
3
|
+
export function sentElsewhereMessage(e) {
|
|
4
|
+
const d = e.sentAt ? new Date(e.sentAt) : null;
|
|
5
|
+
const time = d && !Number.isNaN(d.getTime())
|
|
6
|
+
? d.toLocaleTimeString("nl-NL", { hour: "2-digit", minute: "2-digit" })
|
|
7
|
+
: "onbekende tijd";
|
|
8
|
+
const base = `Pakbon al verstuurd vanuit ${e.origin || "elders"} naar ${e.printerName || "onbekende printer"} om ${time}`;
|
|
9
|
+
return e.barcodeMismatch
|
|
10
|
+
? `${base} (let op: andere kar-barcode ${e.barcode ?? "?"} dan ${e.ownBarcode ?? "?"})`
|
|
11
|
+
: base;
|
|
12
|
+
}
|
|
2
13
|
export const CART_MISSING_MESSAGE = "De kar van deze rij bestaat niet meer in het karplan; ververs de pickwachtrij";
|
|
3
14
|
export class CartMissingError extends Error {
|
|
4
15
|
constructor() {
|
|
@@ -71,6 +82,17 @@ export function resultsFromBatch(requested, jobs, alreadyPrinted) {
|
|
|
71
82
|
return requested.map((cart) => {
|
|
72
83
|
const job = byCart.get(cart.cartId);
|
|
73
84
|
const jobId = job?.jobId ?? null;
|
|
85
|
+
if (!jobId && job?.status === "sent_elsewhere") {
|
|
86
|
+
return {
|
|
87
|
+
cartId: cart.cartId,
|
|
88
|
+
cartLabel: cart.cartLabel,
|
|
89
|
+
outcome: "not_created",
|
|
90
|
+
jobId: null,
|
|
91
|
+
reprint: false,
|
|
92
|
+
reason: job.elsewhere ? sentElsewhereMessage(job.elsewhere) : job.message ?? "Pakbon al verstuurd vanuit elders",
|
|
93
|
+
sentElsewhere: job.elsewhere ?? null,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
74
96
|
return {
|
|
75
97
|
cartId: cart.cartId,
|
|
76
98
|
cartLabel: cart.cartLabel,
|
|
@@ -126,6 +148,8 @@ const LABEL = {
|
|
|
126
148
|
};
|
|
127
149
|
export function cartResultLine(r) {
|
|
128
150
|
const name = r.cartLabel ?? r.cartId;
|
|
151
|
+
if (r.sentElsewhere)
|
|
152
|
+
return `${name} — ${r.reason ?? ""}`.trim();
|
|
129
153
|
return r.outcome === "created" ? `${name} — ${LABEL.created}` : `${name} — ${LABEL[r.outcome]}: ${r.reason ?? ""}`.trim();
|
|
130
154
|
}
|
|
131
155
|
/** Eén kar: korte melding. Meerdere karren: per kar een regel. */
|