@naisys/erp 3.0.0-beta.9 → 3.0.0

package/dist/routes/{operation-run-transitions.js → operations/operation-run-transitions.js}

@@ -1,10 +1,10 @@
 import { ErrorResponseSchema, OperationRunStatus, OperationRunTransitionSlimSchema, OrderRunStatus, TransitionNoteSchema, } from "@naisys/erp-shared";
-import { requirePermission } from "../auth-middleware.js";
-import { conflict, notFound, unprocessable } from "../error-handler.js";
-import { checkOrderRunStarted, checkWorkCenterAccess, mutationResult, resolveOpRun, } from "../route-helpers.js";
-import { clockIn, clockOutAllForOpRun, isUserClockedIn, sumLaborTicketCosts, } from "../services/labor-ticket-service.js";
-import { checkPredecessorsComplete, checkStepsComplete, reblockSuccessors, transitionStatus, unblockSuccessors, validateStatusFor, } from "../services/operation-run-service.js";
-import { transitionStatus as transitionOrderRunStatus } from "../services/order-run-service.js";
+import { conflict, notFound, unprocessable } from "../../error-handler.js";
+import { requirePermission } from "../../middleware/auth-middleware.js";
+import { checkOrderRunStarted, checkWorkCenterAccess, mutationResult, resolveOpRun, } from "../../route-helpers.js";
+import { checkPredecessorsComplete, checkStepsComplete, reblockSuccessors, transitionStatus, unblockSuccessors, validateStatusFor, } from "../../services/operations/operation-run-service.js";
+import { transitionStatus as transitionOrderRunStatus } from "../../services/orders/order-run-service.js";
+import { clockIn, clockOutAllForOpRun, isUserClockedIn, sumLaborTicketMetrics, } from "../../services/production/labor-ticket-service.js";
 import { formatOpRunTransition, SeqNoParamsSchema } from "./operation-runs.js";
 export default function operationRunTransitionRoutes(fastify) {
     const app = fastify.withTypeProvider();
@@ -99,10 +99,11 @@ export default function operationRunTransitionRoutes(fastify) {
             if (stepsErr)
                 return unprocessable(reply, stepsErr);
             await clockOutAllForOpRun(resolved.opRun.id, userId);
-            const cost = await sumLaborTicketCosts(resolved.opRun.id);
+            const { cost, tokens } = await sumLaborTicketMetrics(resolved.opRun.id);
             const opRun = await transitionStatus(resolved.opRun.id, "complete", OperationRunStatus.in_progress, OperationRunStatus.completed, userId, {
                 completedAt: new Date(),
                 cost,
+                tokens,
                 statusNote: note ?? null,
             });
             await unblockSuccessors(resolved.run.id, resolved.opRun.operationId, userId);
@@ -113,10 +114,11 @@ export default function operationRunTransitionRoutes(fastify) {
             });
         },
     });
-    // SKIP (pending → skipped)
+    // SKIP (blocked/pending/in_progress → skipped)
     app.post("/:seqNo/skip", {
         schema: {
-            description: "Skip an operation run (pending → skipped)",
+            description: "Skip an operation run (blocked/pending/in_progress → skipped). " +
+                "When skipping an in_progress op, any open labor tickets are clocked out.",
             tags: ["Operation Runs"],
             params: SeqNoParamsSchema,
             body: TransitionNoteSchema,
@@ -143,11 +145,21 @@ export default function operationRunTransitionRoutes(fastify) {
             const statusErr = validateStatusFor("skip", resolved.opRun.status, [
                 OperationRunStatus.blocked,
                 OperationRunStatus.pending,
+                OperationRunStatus.in_progress,
             ]);
             if (statusErr)
                 return conflict(reply, statusErr);
-            const cost = await sumLaborTicketCosts(resolved.opRun.id);
-            const opRun = await transitionStatus(resolved.opRun.id, "skip", resolved.opRun.status, OperationRunStatus.skipped, userId, { ...(cost > 0 ? { cost } : undefined), statusNote: note ?? null });
+            // If the op was in progress, close out any active labor tickets so the
+            // recorded cost is accurate before we mark the op skipped.
+            if (resolved.opRun.status === OperationRunStatus.in_progress) {
+                await clockOutAllForOpRun(resolved.opRun.id, userId);
+            }
+            const { cost, tokens } = await sumLaborTicketMetrics(resolved.opRun.id);
+            const opRun = await transitionStatus(resolved.opRun.id, "skip", resolved.opRun.status, OperationRunStatus.skipped, userId, {
+                ...(cost > 0 ? { cost } : undefined),
+                ...(tokens > 0 ? { tokens } : undefined),
+                statusNote: note ?? null,
+            });
             await unblockSuccessors(resolved.run.id, resolved.opRun.operationId, userId);
             const full = await formatOpRunTransition(orderKey, runNo, request.erpUser, opRun);
             return mutationResult(request, reply, full, {
@@ -189,8 +201,12 @@ export default function operationRunTransitionRoutes(fastify) {
             if (statusErr)
                 return conflict(reply, statusErr);
             await clockOutAllForOpRun(resolved.opRun.id, userId);
-            const cost = await sumLaborTicketCosts(resolved.opRun.id);
-            const opRun = await transitionStatus(resolved.opRun.id, "fail", OperationRunStatus.in_progress, OperationRunStatus.failed, userId, { ...(cost > 0 ? { cost } : undefined), statusNote: note ?? null });
+            const { cost, tokens } = await sumLaborTicketMetrics(resolved.opRun.id);
+            const opRun = await transitionStatus(resolved.opRun.id, "fail", OperationRunStatus.in_progress, OperationRunStatus.failed, userId, {
+                ...(cost > 0 ? { cost } : undefined),
+                ...(tokens > 0 ? { tokens } : undefined),
+                statusNote: note ?? null,
+            });
             const full = await formatOpRunTransition(orderKey, runNo, request.erpUser, opRun);
             return mutationResult(request, reply, full, {
                 status: opRun.status,

package/dist/routes/{operation-runs.js → operations/operation-runs.js}

@@ -1,20 +1,29 @@
 import { ErrorResponseSchema, MutateResponseSchema, OperationRunListResponseSchema, OperationRunSchema, OperationRunStatus, UpdateOperationRunSchema, } from "@naisys/erp-shared";
 import { z } from "zod/v4";
-import { hasPermission, requirePermission } from "../auth-middleware.js";
-import { conflict, notFound } from "../error-handler.js";
-import { API_PREFIX, selfLink } from "../hateoas.js";
-import { checkOrderRunStarted, checkWorkCenterAccess, childItemLinks, formatAuditFields, formatDate, resolveActions, resolveOpRun, resolveOrderRun, useFullSerializer, wantsFullResponse, } from "../route-helpers.js";
-import { checkStepsComplete, getOpRun, getOpRunFieldRefSummary, getOpRunStepSummary, listOpRuns, updateOpRun, validateStatusFor, } from "../services/operation-run-service.js";
+import { conflict, notFound } from "../../error-handler.js";
+import { API_PREFIX, selfLink } from "../../hateoas.js";
+import { hasPermission, requirePermission, } from "../../middleware/auth-middleware.js";
+import { checkOrderRunStarted, checkWorkCenterAccess, childItemLinks, formatAuditFields, formatDate, resolveActions, resolveOpRun, resolveOrderRun, useFullSerializer, wantsFullResponse, } from "../../route-helpers.js";
+import { checkStepsComplete, getOpRun, getOpRunFieldRefSummary, getOpRunStepSummary, listOpRuns, updateOpRun, validateStatusFor, } from "../../services/operations/operation-run-service.js";
+import { isUserClockedIn } from "../../services/production/labor-ticket-service.js";
 function opRunResource(orderKey, runNo) {
     return `orders/${orderKey}/runs/${runNo}/ops`;
 }
 async function opRunItemActions(orderKey, runNo, seqNo, opRunId, operationId, status, user) {
     const href = `${API_PREFIX}/${opRunResource(orderKey, runNo)}/${seqNo}`;
     const isExecutor = hasPermission(user, "order_executor");
-    const stepsErr = isExecutor && status === OperationRunStatus.in_progress
-        ? await checkStepsComplete(opRunId)
-        : null;
+    const isInProgress = status === OperationRunStatus.in_progress;
+    const stepsErr = isExecutor && isInProgress ? await checkStepsComplete(opRunId) : null;
     const wcErr = user ? await checkWorkCenterAccess(operationId, user) : null;
+    // Completing an op requires the caller to be clocked in (enforced by the
+    // /complete transition). Surface clock-in and the requirement here so an
+    // agent inspecting the op run finds it without following the `labor` link.
+    const userClockedIn = isExecutor && isInProgress && user
+        ? await isUserClockedIn(opRunId, user.id)
+        : false;
+    const notClockedInErr = isExecutor && isInProgress && !userClockedIn
+        ? "You must be clocked in to complete an operation"
+        : null;
     return resolveActions([
         {
             rel: "assign",
@@ -50,6 +59,18 @@ async function opRunItemActions(orderKey, runNo, seqNo, opRunId, operationId, st
                     ? "Operation is blocked by incomplete predecessors"
                     : null),
         },
+        {
+            rel: "clock-in",
+            path: "/labor/clock-in",
+            method: "POST",
+            title: "Clock In",
+            permission: "order_executor",
+            statuses: [OperationRunStatus.in_progress],
+            disabledWhen: () => wcErr ??
+                (userClockedIn
+                    ? "You are already clocked in to this operation"
+                    : null),
+        },
         {
             rel: "update",
             method: "PUT",
@@ -68,7 +89,7 @@ async function opRunItemActions(orderKey, runNo, seqNo, opRunId, operationId, st
             body: { note: "" },
             permission: "order_executor",
             statuses: [OperationRunStatus.in_progress],
-            disabledWhen: () => wcErr ?? stepsErr,
+            disabledWhen: () => wcErr ?? notClockedInErr ?? stepsErr,
         },
         {
             rel: "skip",
@@ -76,7 +97,11 @@ async function opRunItemActions(orderKey, runNo, seqNo, opRunId, operationId, st
             method: "POST",
             title: "Skip",
             permission: "order_manager",
-            statuses: [OperationRunStatus.blocked, OperationRunStatus.pending],
+            statuses: [
+                OperationRunStatus.blocked,
+                OperationRunStatus.pending,
+                OperationRunStatus.in_progress,
+            ],
             disabledWhen: () => wcErr,
         },
         {
@@ -118,10 +143,13 @@ export async function formatOpRun(orderKey, runNo, user, opRun) {
         getOpRunStepSummary(opRun.id),
         getOpRunFieldRefSummary(opRun.operationId, opRun.orderRunId, orderKey, runNo),
     ]);
+    const revNo = opRun.orderRun.orderRev.revNo;
     return {
         id: opRun.id,
         orderRunId: opRun.orderRunId,
         operationId: opRun.operationId,
+        revNo,
+        orderDescription: opRun.orderRun.orderRev.description,
         seqNo,
         title: opRun.operation.title,
         description: opRun.operation.description,
@@ -129,6 +157,7 @@ export async function formatOpRun(orderKey, runNo, user, opRun) {
         status: opRun.status,
         assignedTo: opRun.assignedTo?.username ?? null,
         cost: opRun.cost,
+        tokens: opRun.tokens,
         note: opRun.statusNote ?? null,
         completedAt: formatDate(opRun.completedAt),
         stepSummary: stepSummaryRows.map((sr) => ({
@@ -144,6 +173,11 @@ export async function formatOpRun(orderKey, runNo, user, opRun) {
         ...formatAuditFields(opRun),
         _links: [
             ...childItemLinks("/" + opRunResource(orderKey, runNo), seqNo, "Operation Runs", "/orders/" + orderKey + "/runs/" + runNo, "Order Run", "OperationRun", "run"),
+            {
+                rel: "order-revision",
+                href: `${API_PREFIX}/orders/${orderKey}/revs/${revNo}`,
+                title: "Order Revision",
+            },
             {
                 rel: "steps",
                 href: `${API_PREFIX}/${opRunResource(orderKey, runNo)}/${seqNo}/steps`,
@@ -170,6 +204,7 @@ export async function formatOpRunTransition(orderKey, runNo, user, opRun) {
         status: opRun.status,
         assignedTo: opRun.assignedTo?.username ?? null,
         cost: opRun.cost,
+        tokens: opRun.tokens,
         note: opRun.statusNote ?? null,
         completedAt: formatDate(opRun.completedAt),
         ...formatAuditFields(opRun),
@@ -182,6 +217,8 @@ function formatListOpRun(opRun) {
         id: opRun.id,
         orderRunId: opRun.orderRunId,
         operationId: opRun.operationId,
+        revNo: opRun.orderRun.orderRev.revNo,
+        orderDescription: opRun.orderRun.orderRev.description,
         seqNo,
         title: opRun.operation.title,
         description: opRun.operation.description,
@@ -189,6 +226,7 @@ function formatListOpRun(opRun) {
         status: opRun.status,
         assignedTo: opRun.assignedTo?.username ?? null,
         cost: opRun.cost,
+        tokens: opRun.tokens,
         note: opRun.statusNote ?? null,
         completedAt: formatDate(opRun.completedAt),
         ...formatAuditFields(opRun),

package/dist/routes/{operations.js → operations/operations.js}

@@ -1,11 +1,11 @@
 import { CreateOperationSchema, ErrorResponseSchema, MutateResponseSchema, OperationListResponseSchema, OperationSchema, RevisionStatus, SeqNoCreateResponseSchema, UpdateOperationSchema, } from "@naisys/erp-shared";
 import { z } from "zod/v4";
-import { hasPermission, requirePermission } from "../auth-middleware.js";
-import { conflict, notFound } from "../error-handler.js";
-import { API_PREFIX, selfLink } from "../hateoas.js";
-import { calcNextSeqNo, childItemLinks, draftCrudActions, formatAuditFields, mutationResult, permGate, resolveRevision, } from "../route-helpers.js";
-import { createOperation, deleteOperation, findExisting, getOperation, listOperations, updateOperation, } from "../services/operation-service.js";
-import { findWorkCenterByKey } from "../services/work-center-service.js";
+import { conflict, notFound } from "../../error-handler.js";
+import { API_PREFIX, selfLink } from "../../hateoas.js";
+import { hasPermission, requirePermission, } from "../../middleware/auth-middleware.js";
+import { calcNextSeqNo, childItemLinks, draftCrudActions, formatAuditFields, mutationResult, permGate, resolveRevision, } from "../../route-helpers.js";
+import { createOperation, deleteOperation, findExisting, getOperation, listOperations, updateOperation, } from "../../services/operations/operation-service.js";
+import { findWorkCenterByKey } from "../../services/production/work-center-service.js";
 /** Resolve an optional workCenterKey to a workCenterId. Returns undefined (skip), null (clear), or the ID. */
 async function resolveWorkCenterId(workCenterKey) {
     if (workCenterKey === undefined)

package/dist/routes/{order-revision-transitions.js → orders/order-revision-transitions.js}

@@ -1,8 +1,8 @@
 import { ErrorResponseSchema, OrderRevisionTransitionSchema, RevisionStatus, } from "@naisys/erp-shared";
-import { requirePermission } from "../auth-middleware.js";
-import { conflict, notFound } from "../error-handler.js";
-import { resolveOrder, useFullSerializer, wantsFullResponse, } from "../route-helpers.js";
-import { findExisting, transitionStatus, } from "../services/order-revision-service.js";
+import { conflict, notFound } from "../../error-handler.js";
+import { requirePermission } from "../../middleware/auth-middleware.js";
+import { resolveOrder, useFullSerializer, wantsFullResponse, } from "../../route-helpers.js";
+import { findExisting, transitionStatus, } from "../../services/orders/order-revision-service.js";
 import { formatRevision, revisionItemActions, RevNoParamsSchema, } from "./order-revisions.js";
 export default function orderRevisionTransitionRoutes(fastify) {
     const app = fastify.withTypeProvider();

package/dist/routes/{order-revisions.js → orders/order-revisions.js}

@@ -1,11 +1,11 @@
 import { CreateOrderRevisionSchema, ErrorResponseSchema, MutateResponseSchema, OrderRevisionListQuerySchema, OrderRevisionListResponseSchema, OrderRevisionSchema, RevisionCreateResponseSchema, RevisionDiffQuerySchema, RevisionDiffResponseSchema, RevisionStatus, UpdateOrderRevisionSchema, } from "@naisys/erp-shared";
 import { z } from "zod/v4";
-import { hasPermission, requirePermission } from "../auth-middleware.js";
-import { conflict, notFound } from "../error-handler.js";
-import { API_PREFIX, paginationLinks } from "../hateoas.js";
-import { childItemLinks, formatAuditFields, mutationResult, permGate, resolveActions, resolveOrder, } from "../route-helpers.js";
-import { checkHasOrderRuns, createRevision, deleteRevision, findExisting, getRevision, getRevisionOpSummary, listRevisions, updateRevision, validateDraftStatus, } from "../services/order-revision-service.js";
-import { diffRevisions } from "../services/revision-diff-service.js";
+import { conflict, notFound } from "../../error-handler.js";
+import { API_PREFIX, paginationLinks } from "../../hateoas.js";
+import { hasPermission, requirePermission, } from "../../middleware/auth-middleware.js";
+import { childItemLinks, formatAuditFields, mutationResult, permGate, resolveActions, resolveOrder, } from "../../route-helpers.js";
+import { checkHasOrderRuns, createRevision, deleteRevision, findExisting, getRevision, getRevisionOpSummary, listRevisions, updateRevision, validateDraftStatus, } from "../../services/orders/order-revision-service.js";
+import { diffRevisions } from "../../services/orders/revision-diff-service.js";
 export function revisionItemActions(parentResource, orderKey, revNo, status, user) {
     const href = `${API_PREFIX}/${parentResource}/${orderKey}/revs/${revNo}`;
     return resolveActions([

package/dist/routes/{order-run-transitions.js → orders/order-run-transitions.js}

@@ -1,8 +1,8 @@
 import { CompleteOrderRunSchema, ErrorResponseSchema, OrderRunStatus, OrderRunTransitionSchema, } from "@naisys/erp-shared";
-import { requirePermission } from "../auth-middleware.js";
-import { conflict, notFound, unprocessable } from "../error-handler.js";
-import { resolveOrderRun, useFullSerializer, wantsFullResponse, } from "../route-helpers.js";
-import { checkOpsComplete, completeOrderRun, getReopenTarget, sumOpRunCosts, transitionStatus, validateStatusFor, } from "../services/order-run-service.js";
+import { badRequest, conflict, notFound, unprocessable, } from "../../error-handler.js";
+import { requirePermission } from "../../middleware/auth-middleware.js";
+import { resolveOrderRun, useFullSerializer, wantsFullResponse, } from "../../route-helpers.js";
+import { checkOpsComplete, completeOrderRun, getReopenTarget, sumOpRunCosts, transitionStatus, validateStatusFor, } from "../../services/orders/order-run-service.js";
 import { formatRun, orderRunItemActions, RunNoParamsSchema, } from "./order-runs.js";
 export default function orderRunTransitionRoutes(fastify) {
     const app = fastify.withTypeProvider();
@@ -89,12 +89,15 @@ export default function orderRunTransitionRoutes(fastify) {
     // COMPLETE (started -> closed, creates item instance)
     app.post("/:runNo/complete", {
         schema: {
-            description: "Complete an order run — creates an item instance and closes the run",
+            description: "Complete an order run — creates an item instance and closes the run. " +
+                "Returns 400 if any required item field is missing, or if any supplied " +
+                "fieldSeqNo doesn't exist on the item.",
             tags: ["Order Runs"],
             params: RunNoParamsSchema,
             body: CompleteOrderRunSchema,
             response: {
                 200: OrderRunTransitionSchema,
+                400: ErrorResponseSchema,
                 404: ErrorResponseSchema,
                 409: ErrorResponseSchema,
                 422: ErrorResponseSchema,
@@ -119,6 +122,9 @@ export default function orderRunTransitionRoutes(fastify) {
             const userId = request.erpUser.id;
             const result = await completeOrderRun(resolved.run.id, resolved.order.id, request.body, userId);
             if (result.error) {
+                if (result.status === 400) {
+                    return badRequest(reply, result.error);
+                }
                 return unprocessable(reply, result.error);
             }
             const run = result.run;

package/dist/routes/{order-runs.js → orders/order-runs.js}

@@ -1,10 +1,10 @@
 import { CreateOrderRunSchema, ErrorResponseSchema, MutateResponseSchema, OrderRunListQuerySchema, OrderRunListResponseSchema, OrderRunSchema, OrderRunStatus, RunCreateResponseSchema, UpdateOrderRunSchema, } from "@naisys/erp-shared";
 import { z } from "zod/v4";
-import { hasPermission, requirePermission } from "../auth-middleware.js";
-import { conflict, notFound } from "../error-handler.js";
-import { API_PREFIX, paginationLinks } from "../hateoas.js";
-import { childItemLinks, formatAuditFields, mutationResult, resolveActions, resolveOrder, resolveOrderRun, } from "../route-helpers.js";
-import { checkOpsComplete, createOrderRun, deleteOrderRun, findLatestApprovedRevision, findOrderRevision, getOrderRun, getOrderRunOpSummary, listOrderRuns, updateOrderRun, validateStatusFor, } from "../services/order-run-service.js";
+import { conflict, notFound } from "../../error-handler.js";
+import { API_PREFIX, paginationLinks } from "../../hateoas.js";
+import { hasPermission, requirePermission, } from "../../middleware/auth-middleware.js";
+import { childItemLinks, formatAuditFields, mutationResult, resolveActions, resolveOrder, resolveOrderRun, } from "../../route-helpers.js";
+import { checkOpsComplete, createOrderRun, deleteOrderRun, findLatestApprovedRevision, findOrderRevision, getOrderRun, getOrderRunOpSummary, listOrderRuns, updateOrderRun, validateStatusFor, } from "../../services/orders/order-run-service.js";
 function runResource(orderKey) {
     return `orders/${orderKey}/runs`;
 }
@@ -116,6 +116,7 @@ export async function formatRun(orderKey, user, run) {
         orderId: run.orderId,
         orderKey,
         revNo: run.orderRev.revNo,
+        description: run.orderRev.description,
         itemKey,
         instanceId: instance?.id ?? null,
         instanceKey: instance?.key ?? null,
@@ -143,6 +144,7 @@ function formatListRun(orderKey, run) {
         orderId: run.orderId,
         orderKey,
         revNo: run.orderRev.revNo,
+        description: run.orderRev.description,
         itemKey,
         instanceId: instance?.id ?? null,
         instanceKey: instance?.key ?? null,

package/dist/routes/{orders.js → orders/orders.js}

@@ -1,10 +1,10 @@
 import { CreateOrderSchema, ErrorResponseSchema, KeyCreateResponseSchema, MutateResponseSchema, OrderListQuerySchema, OrderListResponseSchema, OrderSchema, OrderStatus, UpdateOrderSchema, } from "@naisys/erp-shared";
 import { z } from "zod/v4";
-import { hasPermission, requirePermission } from "../auth-middleware.js";
-import { conflict, notFound } from "../error-handler.js";
-import { API_PREFIX, collectionLink, paginationLinks, schemaLink, selfLink, } from "../hateoas.js";
-import { formatAuditFields, mutationResult, permGate, resolveActions, } from "../route-helpers.js";
-import { checkHasRevisions, createOrder, deleteOrder, findExisting, listOrders, resolveItemKey, updateOrder, } from "../services/order-service.js";
+import { conflict, notFound } from "../../error-handler.js";
+import { API_PREFIX, collectionLink, paginationLinks, schemaLink, selfLink, } from "../../hateoas.js";
+import { hasPermission, requirePermission, } from "../../middleware/auth-middleware.js";
+import { formatAuditFields, mutationResult, permGate, resolveActions, } from "../../route-helpers.js";
+import { checkHasRevisions, createOrder, deleteOrder, findExisting, getLatestApprovedRevNo, listOrders, resolveItemKey, updateOrder, } from "../../services/orders/order-service.js";
 function orderLinks(resource, key, schemaName) {
     return [
         selfLink(`/${resource}/${key}`),
@@ -64,13 +64,14 @@ const RESOURCE = "orders";
 const KeyParamsSchema = z.object({
     key: z.string(),
 });
-function formatOrder(order, user) {
+function formatOrder(order, user, latestApprovedRevNo) {
     return {
         id: order.id,
         key: order.key,
         description: order.description,
         status: order.status,
         itemKey: order.item?.key ?? null,
+        latestApprovedRevNo,
         ...formatAuditFields(order),
         _links: [
             ...orderLinks(RESOURCE, order.key, "Order"),
@@ -81,8 +82,8 @@ function formatOrder(order, user) {
     };
 }
 function formatListOrder(order, user) {
-    const { _actions, ...rest } = formatOrder(order, user);
-    const { _links: _, ...withoutLinks } = rest;
+    const { _actions, ...rest } = formatOrder(order, user, null);
+    const { _links: _, latestApprovedRevNo: __, ...withoutLinks } = rest;
     return withoutLinks;
 }
 export default function orderRoutes(fastify) {
@@ -159,7 +160,8 @@ export default function orderRoutes(fastify) {
                 }
             }
             const order = await createOrder(key, description, itemId, userId);
-            const full = formatOrder(order, request.erpUser);
+            // Newly-created order has no revisions yet, so latestApprovedRevNo is null
+            const full = formatOrder(order, request.erpUser, null);
             reply.status(201);
             return mutationResult(request, reply, full, {
                 id: full.id,
@@ -186,7 +188,8 @@ export default function orderRoutes(fastify) {
             if (!order) {
                 return notFound(reply, `Order '${key}' not found`);
             }
-            return formatOrder(order, request.erpUser);
+            const latestApprovedRevNo = await getLatestApprovedRevNo(order.id);
+            return formatOrder(order, request.erpUser, latestApprovedRevNo);
         },
     });
     // UPDATE
@@ -225,7 +228,8 @@ export default function orderRoutes(fastify) {
                 }
             }
             const order = await updateOrder(key, dbData, userId);
-            const full = formatOrder(order, request.erpUser);
+            const latestApprovedRevNo = await getLatestApprovedRevNo(order.id);
+            const full = formatOrder(order, request.erpUser, latestApprovedRevNo);
             return mutationResult(request, reply, full, {
                 _actions: full._actions,
             });

package/dist/routes/{dispatch.js → production/dispatch.js}

@@ -1,7 +1,7 @@
-import { DispatchListQuerySchema, DispatchListResponseSchema, OperationRunStatus, OrderRunStatus, } from "@naisys/erp-shared";
-import erpDb from "../erpDb.js";
-import { API_PREFIX, paginationLinks } from "../hateoas.js";
-import { getUserWorkCenterIds } from "../services/work-center-service.js";
+import { DispatchListQuerySchema, DispatchListResponseSchema, OperationRunStatus, OrderRunStatus, ReadyToCloseListQuerySchema, ReadyToCloseListResponseSchema, } from "@naisys/erp-shared";
+import erpDb from "../../database/erpDb.js";
+import { API_PREFIX, paginationLinks } from "../../hateoas.js";
+import { getUserWorkCenterIds } from "../../services/production/work-center-service.js";
 const OPEN_ORDER_STATUSES = [OrderRunStatus.released, OrderRunStatus.started];
 const DEFAULT_OP_STATUSES = [
     OperationRunStatus.pending,
@@ -64,9 +64,7 @@ export default function dispatchRoutes(fastify) {
                 // Intersect with the requested status filter
                 const currentStatuses = status ? [status] : DEFAULT_OP_STATUSES;
                 const filteredStatuses = currentStatuses.filter((s) => workableStatuses.includes(s));
-                where.status = {
-                    in: filteredStatuses.length > 0 ? filteredStatuses : ["__none__"],
-                };
+                where.status = { in: filteredStatuses };
                 // Work center access
                 if (userWcIds.length > 0) {
                     where.operation = {
@@ -147,6 +145,11 @@ export default function dispatchRoutes(fastify) {
                         canWork: canWork ? "true" : undefined,
                         clockedIn: clockedIn ? "true" : undefined,
                     }),
+                    {
+                        rel: "ready-to-close",
+                        href: `${API_PREFIX}/dispatch/ready-to-close`,
+                        title: "Ready to Close",
+                    },
                     {
                         rel: "work-centers",
                         href: `${API_PREFIX}/work-centers`,
@@ -170,5 +173,83 @@ export default function dispatchRoutes(fastify) {
             };
         },
     });
+    app.get("/ready-to-close", {
+        schema: {
+            description: "List open order runs whose operations are all completed or skipped (ready to close)",
+            tags: ["Dispatch"],
+            querystring: ReadyToCloseListQuerySchema,
+            response: {
+                200: ReadyToCloseListResponseSchema,
+            },
+        },
+        handler: async (request) => {
+            const { page, pageSize, priority, search } = request.query;
+            const where = {
+                status: { in: OPEN_ORDER_STATUSES },
+                operationRuns: {
+                    none: {
+                        status: {
+                            notIn: [OperationRunStatus.completed, OperationRunStatus.skipped],
+                        },
+                    },
+                },
+                ...(priority ? { priority } : {}),
+            };
+            if (search) {
+                where.OR = [
+                    { order: { key: { contains: search } } },
+                    { orderRev: { description: { contains: search } } },
+                ];
+            }
+            const [items, total] = await Promise.all([
+                erpDb.orderRun.findMany({
+                    where,
+                    include: {
+                        order: { select: { key: true } },
+                        orderRev: { select: { revNo: true, description: true } },
+                        _count: { select: { operationRuns: true } },
+                    },
+                    skip: (page - 1) * pageSize,
+                    take: pageSize,
+                    orderBy: { dueAt: "asc" },
+                }),
+                erpDb.orderRun.count({ where }),
+            ]);
+            return {
+                items: items.map((run) => ({
+                    id: run.id,
+                    orderKey: run.order.key,
+                    revNo: run.orderRev.revNo,
+                    runNo: run.runNo,
+                    description: run.orderRev.description,
+                    status: run.status,
+                    priority: run.priority,
+                    dueAt: run.dueAt,
+                    opCount: run._count.operationRuns,
+                    createdAt: run.createdAt.toISOString(),
+                })),
+                total,
+                page,
+                pageSize,
+                _links: [
+                    ...paginationLinks("dispatch/ready-to-close", page, pageSize, total, {
+                        priority,
+                        search,
+                    }),
+                    {
+                        rel: "dispatch",
+                        href: `${API_PREFIX}/dispatch`,
+                        title: "Open Operations",
+                    },
+                ],
+                _linkTemplates: [
+                    {
+                        rel: "item",
+                        hrefTemplate: `${API_PREFIX}/orders/{orderKey}/runs/{runNo}`,
+                    },
+                ],
+            };
+        },
+    });
 }
 //# sourceMappingURL=dispatch.js.map

package/dist/routes/{inventory.js → production/inventory.js}

@@ -1,6 +1,36 @@
 import { InventoryListQuerySchema, InventoryListResponseSchema, } from "@naisys/erp-shared";
-import erpDb from "../erpDb.js";
-import { API_PREFIX, paginationLinks } from "../hateoas.js";
+import erpDb from "../../database/erpDb.js";
+import { API_PREFIX, paginationLinks } from "../../hateoas.js";
+import { hasPermission } from "../../middleware/auth-middleware.js";
+function buildInventoryActionTemplates(user) {
+    const templates = [
+        {
+            rel: "viewInstance",
+            hrefTemplate: `${API_PREFIX}/items/{itemKey}/instances/{id}`,
+            method: "GET",
+            title: "View Instance",
+        },
+    ];
+    if (hasPermission(user, "item_manager")) {
+        templates.push({
+            rel: "update-field-value",
+            hrefTemplate: `${API_PREFIX}/items/{itemKey}/instances/{id}/fields/{fieldSeqNo}`,
+            method: "PUT",
+            title: "Update Field Value (implicit set 0)",
+            schema: `${API_PREFIX}/schemas/UpdateFieldValue`,
+            body: { value: "" },
+        });
+        templates.push({
+            rel: "update-set-field-value",
+            hrefTemplate: `${API_PREFIX}/items/{itemKey}/instances/{id}/sets/{setIndex}/fields/{fieldSeqNo}`,
+            method: "PUT",
+            title: "Update Field Value (explicit set index)",
+            schema: `${API_PREFIX}/schemas/UpdateFieldValue`,
+            body: { value: "" },
+        });
+    }
+    return templates;
+}
 export default function inventoryRoutes(fastify) {
     const app = fastify.withTypeProvider();
     app.get("/", {
@@ -55,14 +85,7 @@ export default function inventoryRoutes(fastify) {
                 _links: paginationLinks("inventory", page, pageSize, total, {
                     search,
                 }),
-                _actionTemplates: [
-                    {
-                        rel: "viewInstance",
-                        hrefTemplate: `${API_PREFIX}/items/{itemKey}/instances/{id}`,
-                        method: "GET",
-                        title: "View Instance",
-                    },
-                ],
+                _actionTemplates: buildInventoryActionTemplates(request.erpUser),
             };
         },
     });

package/dist/routes/{labor-tickets.js → production/labor-tickets.js}

@@ -1,10 +1,10 @@
 import { ClockOutLaborTicketSchema, CreateResponseSchema, ErrorResponseSchema, LaborTicketListResponseSchema, MutateResponseSchema, OperationRunStatus, } from "@naisys/erp-shared";
 import { z } from "zod/v4";
-import { hasPermission, requirePermission } from "../auth-middleware.js";
-import { notFound } from "../error-handler.js";
-import { API_PREFIX, selfLink } from "../hateoas.js";
-import { checkOpRunInProgress, formatAuditFields, formatDate, mutationResult, permGate, resolveOpRun, } from "../route-helpers.js";
-import { clockIn, clockOut, deleteLaborTicket, listLaborTickets, } from "../services/labor-ticket-service.js";
+import { notFound } from "../../error-handler.js";
+import { API_PREFIX, selfLink } from "../../hateoas.js";
+import { hasPermission, requirePermission, } from "../../middleware/auth-middleware.js";
+import { checkOpRunInProgress, formatAuditFields, formatDate, mutationResult, permGate, resolveOpRun, } from "../../route-helpers.js";
+import { clockIn, clockOut, deleteLaborTicket, listLaborTickets, } from "../../services/production/labor-ticket-service.js";
 function laborResource(orderKey, runNo, seqNo) {
     return `orders/${orderKey}/runs/${runNo}/ops/${seqNo}/labor`;
 }
@@ -72,14 +72,13 @@ function laborTicketListActions(orderKey, runNo, seqNo, opRunStatus, user, ticke
     return actions;
 }
 function laborTicketActionTemplates(orderKey, runNo, seqNo, user) {
-    if (!hasPermission(user, "order_manager"))
-        return [];
     return [
         {
             rel: "deleteTicket",
             hrefTemplate: `${API_PREFIX}/${laborResource(orderKey, runNo, seqNo)}/{ticketId}`,
             method: "DELETE",
             title: "Delete Ticket",
+            ...permGate(hasPermission(user, "order_manager"), "order_manager"),
         },
     ];
 }
@@ -93,6 +92,7 @@ function formatLaborTicket(orderKey, runNo, seqNo, ticket) {
         clockIn: ticket.clockIn.toISOString(),
         clockOut: formatDate(ticket.clockOut),
         cost: ticket.cost,
+        tokens: ticket.tokens,
         ...formatAuditFields(ticket),
         _links: [
             selfLink(`/${laborResource(orderKey, runNo, seqNo)}/${ticket.id}`),