diff --git a/src/app/api/jo/actions.ts b/src/app/api/jo/actions.ts index 477bf4cc..5f380266 100644 --- a/src/app/api/jo/actions.ts +++ b/src/app/api/jo/actions.ts @@ -905,7 +905,7 @@ export const fetchAllJoborderProductProcessInfo = cache(async (type?: string | n ); }); -/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.5 | 2026-08-06 */ +/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.7 | 2026-08-06 */ export const fetchJoborderProductProcessesPage = cache(async (params: { /** Job order / process date(YYYY-MM-DD) */ date?: string | null; diff --git a/src/authorities.ts b/src/authorities.ts index 08e222ed..0ce7f019 100644 --- a/src/authorities.ts +++ b/src/authorities.ts @@ -20,7 +20,7 @@ export const AUTH = { JOB_MAT: "JOB_MAT", JOB_PROD: "JOB_PROD", /** - * FP-MTMS Version Checklist | Functions Ref. No. 51 | v1.0.0 | 2026-08-05 + * FP-MTMS Version Checklist | Functions Ref. No. 51 | v1.0.1 | 2026-08-06 * 工單 生產流程 完成工單 */ PRODUCT_PROCESS: "PRODUCT_PROCESS", @@ -28,7 +28,7 @@ export const AUTH = { } as const; /** - * FP-MTMS Version Checklist | Functions Ref. No. 51 | v1.0.0 | 2026-08-05 + * FP-MTMS Version Checklist | Functions Ref. No. 51 | v1.0.1 | 2026-08-06 * Match session ability codes (exact, trimmed). */ export function hasAbility( diff --git a/src/components/ProductionProcess/JobOrderOpsTable.tsx b/src/components/ProductionProcess/JobOrderOpsTable.tsx index 2dc17177..90a555a9 100644 --- a/src/components/ProductionProcess/JobOrderOpsTable.tsx +++ b/src/components/ProductionProcess/JobOrderOpsTable.tsx @@ -223,7 +223,7 @@ interface JobOrderOpsTableProps { printerCombo?: PrinterCombo[]; } -/** FP-MTMS Version Checklist | Functions Ref. No. 47 | v1.0.4 | 2026-08-06 */ +/** FP-MTMS Version Checklist | Functions Ref. No. 47 | v1.0.5 | 2026-08-06 */ const JobOrderOpsTable: React.FC = ({ onSelectProcess, printerCombo = [], @@ -232,10 +232,9 @@ const JobOrderOpsTable: React.FC = ({ const { data: session } = useSession() as { data: SessionWithTokens | null }; const sessionToken = session as SessionWithTokens | null; const abilities = session?.abilities ?? session?.user?.abilities ?? []; - /** 取消工單:僅 ADMIN */ + /** 取消工單 / 完成工單:僅 ADMIN */ const canCancel = hasAbility(abilities, AUTH.ADMIN); - /** 完成工單:僅 PRODUCT_PROCESS(工單 生產流程 完成工單) */ - const canComplete = hasAbility(abilities, AUTH.PRODUCT_PROCESS); + const canComplete = hasAbility(abilities, AUTH.ADMIN); const labelPrinterCombo = useMemo( () => (printerCombo || []).filter((p) => p.type === "Label"), diff --git a/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx b/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx index c735421b..dbb73b76 100644 --- a/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx +++ b/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx @@ -53,7 +53,7 @@ interface ProductProcessJobOrderDetailProps { initialTabIndex?: number; } -/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.5 | 2026-08-06 */ +/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.7 | 2026-08-06 */ const ProductionProcessJobOrderDetail: React.FC = ({ jobOrderId, onBack, diff --git a/src/components/ProductionProcess/ProductionProcessList.tsx b/src/components/ProductionProcess/ProductionProcessList.tsx index eeb5ff79..81593055 100644 --- a/src/components/ProductionProcess/ProductionProcessList.tsx +++ b/src/components/ProductionProcess/ProductionProcessList.tsx @@ -178,7 +178,7 @@ function isWaitingQcPutAway( return s !== "completed" && s !== "rejected"; } -/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.5 | 2026-08-06 */ +/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.7 | 2026-08-06 */ const ProductProcessList: React.FC = ({ onSelectProcess, printerCombo, @@ -209,8 +209,8 @@ const ProductProcessList: React.FC = ({ const [modalInfo, setModalInfo] = useState(); const currentUserId = session?.id ? parseInt(session.id) : undefined; const abilities = session?.abilities ?? session?.user?.abilities ?? []; - /** 完成工單:僅 PRODUCT_PROCESS(工單 生產流程 完成工單);不含 ADMIN 以免群組 ADMIN 繞過勾選 */ - const canManageUpdateJo = hasAbility(abilities, AUTH.PRODUCT_PROCESS); + /** 完成工單:僅 ADMIN */ + const canManageUpdateJo = hasAbility(abilities, AUTH.ADMIN); type ProcessFilter = "all" | "drink" | "Powder_Mixture" | "other"; const listTab = normalizeListTab(listPersistedState.pickBucket); @@ -1230,20 +1230,17 @@ const ProductProcessList: React.FC = ({ {t("Matching Stock")} - {statusLower !== "completed" && ( + {canManageUpdateJo && statusLower !== "completed" && (