@seedtactics/insight-client 17.0.1-beta.5 → 17.0.1-beta.7

package/dist/components/station-monitor/BasketLoadStationWork.js

@@ -69,14 +69,48 @@ function basketAction(mat, basketId) {
     }
     return undefined;
 }
-function confirmableWork(material, basketId) {
+function stationWork(material, basket) {
     const classifiedActions = LazySeq.of(material)
-        .collect((mat) => basketAction(mat, basketId))
+        .collect((mat) => basketAction(mat, basket.basketId))
         .toRArray();
     if (classifiedActions.some((action) => action.type === "invalid")) {
         return { type: "inconsistent" };
     }
     const validActions = classifiedActions.filter((action) => action.type === "valid");
+    const descriptor = basket.loadStationWork;
+    if (descriptor !== undefined) {
+        if (!descriptor ||
+            !isNonBlank(descriptor.workId) ||
+            typeof descriptor.readyToConfirm !== "boolean")
+            return { type: "inconsistent" };
+        const awaiting = descriptor.awaitingMaterialSlots ?? [];
+        if (!Array.isArray(awaiting) ||
+            !awaiting.every(isPositiveInteger) ||
+            new Set(awaiting).size !== awaiting.length ||
+            (descriptor.readyToConfirm && awaiting.length > 0) ||
+            validActions.some((action) => action.workId !== descriptor.workId))
+            return { type: "inconsistent" };
+        const empty = descriptor.type === api.BasketLoadStationWorkType.ConfirmEmptyBasket;
+        if (empty) {
+            if (validActions.length > 0 ||
+                awaiting.length > 0 ||
+                material.some((mat) => mat.location.type === api.LocType.InBasket && mat.location.basketId === basket.basketId))
+                return { type: "inconsistent" };
+        }
+        else if (descriptor.type !== api.BasketLoadStationWorkType.Material ||
+            (descriptor.readyToConfirm && validActions.length === 0)) {
+            return { type: "inconsistent" };
+        }
+        return {
+            type: "active",
+            work: {
+                workId: descriptor.workId,
+                ready: descriptor.readyToConfirm,
+                confirmEmpty: empty,
+                awaitingSlots: awaiting,
+            },
+        };
+    }
     if (validActions.length === 0)
         return { type: "none" };
     const tagged = validActions.filter((action) => isNonBlank(action.workId));
@@ -85,8 +119,8 @@ function confirmableWork(material, basketId) {
         return { type: "inconsistent" };
     }
     return {
-        type: "confirmable",
-        work: { workId: tagged[0].workId },
+        type: "active",
+        work: { workId: tagged[0].workId, ready: true, confirmEmpty: false, awaitingSlots: [] },
     };
 }
 function loadingInstruction(mat) {
@@ -105,21 +139,28 @@ function SlotMaterial({ material, fsize, }) {
 }
 export function BasketLoadStationWorkflow({ stationNumber, basket, material, fsize, submitCommand, }) {
     const [submission, setSubmission] = useState();
-    const workState = useMemo(() => confirmableWork(material, basket.basketId), [basket.basketId, material]);
-    const work = workState.type === "confirmable" ? workState.work : undefined;
-    const submissionState = submission !== undefined && submission.workId === work?.workId ? submission.state : "idle";
+    const workState = useMemo(() => stationWork(material, basket), [basket, material]);
+    const work = workState.type === "active" ? workState.work : undefined;
+    const submissionState = submission !== undefined &&
+        submission.workId === work?.workId &&
+        // A conflict rejects the submitted status snapshot, not the preserved occurrence.
+        // Compare the captured snapshot even when refresh precedes the response.
+        (submission.state !== "conflict" ||
+            (submission.basket === basket && submission.material === material))
+        ? submission.state
+        : "idle";
     const materialBySlot = useMemo(() => LazySeq.of(material)
         .filter((mat) => mat.location.type === api.LocType.InBasket &&
         mat.location.basketId === basket.basketId &&
         mat.location.basketSlot !== undefined)
         .groupBy((mat) => mat.location.basketSlot ?? 0)
-        .toHashMap((entry) => entry), [basket.basketId, material]);
+        .toHashMap((entry) => entry), [basket, material]);
     const loadsBySlot = useMemo(() => LazySeq.of(material)
         .filter((mat) => mat.action.type === api.ActionType.LoadingToBasket &&
         mat.action.loadToBasketId === basket.basketId &&
         mat.action.loadToBasketSlot !== undefined)
         .groupBy((mat) => mat.action.loadToBasketSlot ?? 0)
-        .toHashMap((entry) => entry), [basket.basketId, material]);
+        .toHashMap((entry) => entry), [basket, material]);
     const slots = useMemo(() => LazySeq.of(basket.emptySlots ?? [])
         .concat(basket.unknownSlots ?? [])
         .concat(materialBySlot.keysToLazySeq())
@@ -127,19 +168,21 @@ export function BasketLoadStationWorkflow({ stationNumber, basket, material, fsi
         .distinctBy((slot) => slot)
         .toSortedArray((slot) => slot), [basket.emptySlots, basket.unknownSlots, materialBySlot, loadsBySlot]);
     async function submit() {
-        if (work === undefined || submitCommand === undefined)
+        if (work === undefined || !work.ready || submitCommand === undefined)
             return;
         const submittedWorkId = work.workId;
-        setSubmission({ workId: submittedWorkId, state: "submitting" });
+        const pending = { workId: submittedWorkId, basket, material, state: "submitting" };
+        setSubmission(pending);
         try {
             const state = await submitCommand(stationNumber, { workId: submittedWorkId });
-            setSubmission((current) => current?.workId === submittedWorkId ? { workId: submittedWorkId, state } : current);
+            setSubmission((current) => (current === pending ? { ...pending, state } : current));
         }
         catch {
-            setSubmission((current) => current?.workId === submittedWorkId ? { workId: submittedWorkId, state: "error" } : current);
+            setSubmission((current) => (current === pending ? { ...pending, state: "error" } : current));
         }
     }
-    const submissionDisabled = submissionState === "submitting" ||
+    const submissionDisabled = !work?.ready ||
+        submissionState === "submitting" ||
         submissionState === "accepted" ||
         submissionState === "conflict";
     return (_jsxs(Stack, { spacing: 2, sx: { mt: 2 }, children: [_jsx(Typography, { variant: "h6", children: "Basket slots" }), _jsx(Box, { sx: {
@@ -155,5 +198,7 @@ export function BasketLoadStationWorkflow({ stationNumber, basket, material, fsi
                             basketId: basket.basketId,
                             slot,
                         }, children: _jsxs(Box, { component: "section", "data-testid": `basket-load-station-slot-${slot}`, sx: { border: "1px solid", borderColor: "text.primary", p: 2 }, children: [_jsxs(Typography, { variant: "h6", children: ["Slot ", slot] }), slotMaterial.length > 0 ? (_jsx(SlotMaterial, { material: slotMaterial, fsize: fsize })) : (_jsx(Typography, { color: isUnknown ? "warning.main" : "text.secondary", children: isUnknown ? "Unknown" : "Empty" })), loads.map((mat, index) => (_jsxs(Box, { sx: { mt: 1 }, children: [_jsx(Typography, { children: loadingInstruction(mat) }), _jsxs(Typography, { variant: "body2", color: "text.secondary", children: [mat.partName, " \u00B7 Process ", mat.action.processAfterLoad ?? mat.process] })] }, `${mat.jobUnique}-${mat.process}-${index}`)))] }) }, slot));
-                }) }), work && submitCommand ? (_jsx(Box, { sx: { display: "flex", justifyContent: "flex-end" }, children: _jsx(Button, { variant: "contained", disabled: submissionDisabled, onClick: () => void submit(), children: "Confirm" }) })) : work ? (_jsx(Alert, { severity: "warning", children: "Basket work confirmation is not configured." })) : workState.type === "inconsistent" ? (_jsx(Alert, { severity: "warning", children: "Basket work is inconsistent. Wait for refreshed material actions before confirming." })) : null, submissionState === "accepted" ? (_jsx(Alert, { severity: "success", children: "Confirmation accepted. Waiting for refreshed work." })) : submissionState === "conflict" ? (_jsx(Alert, { severity: "warning", children: "Basket work changed before confirmation. Review the refreshed slots and try again." })) : submissionState === "error" ? (_jsx(Alert, { severity: "error", children: "Unable to confirm basket work. No work was assumed complete." })) : null] }));
+                }) }), work?.confirmEmpty && _jsxs(Typography, { children: ["Confirm basket ", basket.basketId, " is empty."] }), work && !work.ready && (_jsx(Alert, { severity: "info", children: work.awaitingSlots.length > 0
+                    ? `Waiting for material for slots ${work.awaitingSlots.join(", ")}.`
+                    : "Basket work is not ready for confirmation." })), work && submitCommand ? (_jsx(Box, { sx: { display: "flex", justifyContent: "flex-end" }, children: _jsx(Button, { variant: "contained", disabled: submissionDisabled, onClick: () => void submit(), children: "Confirm" }) })) : work ? (_jsx(Alert, { severity: "warning", children: "Basket work confirmation is not configured." })) : workState.type === "inconsistent" ? (_jsx(Alert, { severity: "warning", children: "Basket work is inconsistent. Wait for refreshed material actions before confirming." })) : null, submissionState === "accepted" ? (_jsx(Alert, { severity: "success", children: "Confirmation accepted. Waiting for refreshed work." })) : submissionState === "conflict" ? (_jsx(Alert, { severity: "warning", children: "Basket work changed before confirmation. Review the refreshed slots and try again." })) : submissionState === "error" ? (_jsx(Alert, { severity: "error", children: "Unable to confirm basket work. No work was assumed complete." })) : null] }));
 }

package/dist/index.html

@@ -43,7 +43,7 @@
         }
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-C6EBFHuW.js"></script>
+    <script type="module" crossorigin src="/assets/index-CNJT3DX_.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DXfAwuj-.css">
   </head>
   <body>

package/dist/network/api.d.ts

@@ -1060,6 +1060,7 @@ export declare enum WorkorderSerialCloseout {
 }
 export declare class BasketStatus implements IBasketStatus {
     basketId: number;
+    loadStationWork?: BasketLoadStationWork | undefined;
     position?: BasketPosition | undefined;
     emptySlots?: number[];
     unknownSlots?: number[];
@@ -1070,10 +1071,31 @@ export declare class BasketStatus implements IBasketStatus {
 }
 export interface IBasketStatus {
     basketId: number;
+    loadStationWork?: BasketLoadStationWork | undefined;
     position?: BasketPosition | undefined;
     emptySlots?: number[];
     unknownSlots?: number[];
 }
+export declare class BasketLoadStationWork implements IBasketLoadStationWork {
+    workId: string;
+    type: BasketLoadStationWorkType;
+    readyToConfirm: boolean;
+    awaitingMaterialSlots?: number[];
+    constructor(data?: IBasketLoadStationWork);
+    init(_data?: any): void;
+    static fromJS(data: any): BasketLoadStationWork;
+    toJSON(data?: any): any;
+}
+export interface IBasketLoadStationWork {
+    workId: string;
+    type: BasketLoadStationWorkType;
+    readyToConfirm: boolean;
+    awaitingMaterialSlots?: number[];
+}
+export declare enum BasketLoadStationWorkType {
+    Material = "Material",
+    ConfirmEmptyBasket = "ConfirmEmptyBasket"
+}
 export declare class BasketPosition implements IBasketPosition {
     location: BasketLocationEnum;
     locationNum: number;

package/dist/network/api.js

@@ -4412,6 +4412,9 @@ export class BasketStatus {
     init(_data) {
         if (_data) {
             this.basketId = _data["BasketId"];
+            this.loadStationWork = _data["LoadStationWork"]
+                ? BasketLoadStationWork.fromJS(_data["LoadStationWork"])
+                : undefined;
             this.position = _data["Position"]
                 ? BasketPosition.fromJS(_data["Position"])
                 : undefined;
@@ -4436,6 +4439,9 @@ export class BasketStatus {
     toJSON(data) {
         data = typeof data === "object" ? data : {};
         data["BasketId"] = this.basketId;
+        data["LoadStationWork"] = this.loadStationWork
+            ? this.loadStationWork.toJSON()
+            : undefined;
         data["Position"] = this.position ? this.position.toJSON() : undefined;
         if (Array.isArray(this.emptySlots)) {
             data["EmptySlots"] = [];
@@ -4450,6 +4456,51 @@ export class BasketStatus {
         return data;
     }
 }
+export class BasketLoadStationWork {
+    constructor(data) {
+        if (data) {
+            for (var property in data) {
+                if (data.hasOwnProperty(property))
+                    this[property] = data[property];
+            }
+        }
+    }
+    init(_data) {
+        if (_data) {
+            this.workId = _data["WorkId"];
+            this.type = _data["Type"];
+            this.readyToConfirm = _data["ReadyToConfirm"];
+            if (Array.isArray(_data["AwaitingMaterialSlots"])) {
+                this.awaitingMaterialSlots = [];
+                for (let item of _data["AwaitingMaterialSlots"])
+                    this.awaitingMaterialSlots.push(item);
+            }
+        }
+    }
+    static fromJS(data) {
+        data = typeof data === "object" ? data : {};
+        let result = new BasketLoadStationWork();
+        result.init(data);
+        return result;
+    }
+    toJSON(data) {
+        data = typeof data === "object" ? data : {};
+        data["WorkId"] = this.workId;
+        data["Type"] = this.type;
+        data["ReadyToConfirm"] = this.readyToConfirm;
+        if (Array.isArray(this.awaitingMaterialSlots)) {
+            data["AwaitingMaterialSlots"] = [];
+            for (let item of this.awaitingMaterialSlots)
+                data["AwaitingMaterialSlots"].push(item);
+        }
+        return data;
+    }
+}
+export var BasketLoadStationWorkType;
+(function (BasketLoadStationWorkType) {
+    BasketLoadStationWorkType["Material"] = "Material";
+    BasketLoadStationWorkType["ConfirmEmptyBasket"] = "ConfirmEmptyBasket";
+})(BasketLoadStationWorkType || (BasketLoadStationWorkType = {}));
 export class BasketPosition {
     constructor(data) {
         if (data) {

package/docs/mazak.md

@@ -13,6 +13,19 @@ FMS Insight works with all Palletech cell controller versions from Mazak: Versio
 and Smooth PMC. FMS Insight can read all events from the cell controller and can also edit almost
 all the data in the cell controller.
 
+## Load station numbering
+
+In the Mazak configuration section, Load Station Numbers = 10,30 maps controller L/U 1 to Insight
+station 10 and controller L/U 2 to Insight station 30. This works like Machine Numbers: list
+positions identify controller equipment, while values identify equipment in jobs, logs and APIs.
+Both job downloads and status/event reads translate through the same map. Station display names are
+maintained separately.
+
+Omitting the list preserves identity numbering. Explicit lists must contain unique positive IDs and
+cover every controller L/U station used. Job routes outside the map are rejected. The old Starting
+Load Station Number setting has been removed and is rejected; replace it with an explicit list when
+updating configuration.
+
 ## Open Database Kit
 
 To facilitate the communication between FMS Insight and the Mazak cell controller, you must acquire

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seedtactics/insight-client",
-  "version": "17.0.1-beta.5",
+  "version": "17.0.1-beta.7",
   "license": "BSD-3-Clause",
   "repository": {
     "url": "https://github.com/SeedTactics/fms-insight"