From 6d0531a412dc62d7cedd9d1b9418789e7e1c057f Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Thu, 6 Aug 2026 22:56:15 +0800
Subject: [PATCH] =?UTF-8?q?List=20=E5=8D=A1=E7=89=87=E7=9A=84=E3=80=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E5=96=AE=E3=80=8D=E7=8F=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=20ADMIN=20=E6=89=8D=E6=9C=83=E9=A1=AF?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E9=9D=9E=20ADMIN=20=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=88=B0=E6=8C=89=E9=88=95=E3=80=82=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E5=96=AE=EF=BC=8F=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=20API=20=E6=94=B9=E7=82=BA=E5=83=85=20ADMIN=EF=BC=9B=E3=80=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=96=AE=E7=94=9F=E7=94=A2=E6=B5=81=E7=A8=8B=E3=80=8D?=
 =?UTF-8?q?tab=20=E5=83=85=20ADMIN=20=E5=8F=AF=E8=A6=8B=EF=BC=9B=E3=80=8C?=
 =?UTF-8?q?=E5=B7=B2=E6=8F=90=E6=96=99=E3=80=8D=E6=94=B9=E7=82=BA=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=20POL=20completed=EF=BC=9B=E6=96=87=E6=A1=88=E3=80=8C?=
 =?UTF-8?q?=E6=9C=AA=E6=8F=90=E6=96=99=E3=80=8D=E2=86=92=E3=80=8C=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8F=90=E6=96=99=E3=80=8D=EF=BC=8FPick=20in?=
 =?UTF-8?q?complete=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/api/jo/actions.ts                     |  2 +-
 src/authorities.ts                            |  4 +-
 .../ProductionProcess/JobOrderOpsTable.tsx    |  7 +--
 .../ProductionProcessJobOrderDetail.tsx       |  2 +-
 .../ProductionProcessList.tsx                 | 23 ++++----
 .../ProductionProcessPage.tsx                 | 57 ++++++++++++-------
 src/i18n/en/productionProcess.json            | 10 ++--
 src/i18n/zh/productionProcess.json            | 10 ++--
 8 files changed, 65 insertions(+), 50 deletions(-)

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<JobOrderOpsTableProps> = ({
   onSelectProcess,
   printerCombo = [],
@@ -232,10 +232,9 @@ const JobOrderOpsTable: React.FC<JobOrderOpsTableProps> = ({
   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<ProductProcessJobOrderDetailProps> = ({
   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<ProductProcessListProps> = ({
   onSelectProcess,
   printerCombo,
@@ -209,8 +209,8 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({
   const [modalInfo, setModalInfo] = useState<StockInLineInput>();
   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<ProductProcessListProps> = ({
                                   {t("Matching Stock")}
                                 </Button>
 
-                                {statusLower !== "completed" && (
+                                {canManageUpdateJo && statusLower !== "completed" && (
                                   <Button
                                     variant="contained"
                                     size="small"
-                                    disabled={!canManageUpdateJo}
                                     onClick={() =>
-                                      canManageUpdateJo
-                                        ? openConfirm(
-                                            t("Confirm to update this Job Order?"),
-                                            async () => {
-                                              await handleUpdateJo(process);
-                                            },
-                                          )
-                                        : undefined
+                                      openConfirm(
+                                        t("Confirm to update this Job Order?"),
+                                        async () => {
+                                          await handleUpdateJo(process);
+                                        },
+                                      )
                                     }
                                   >
                                     {t("Update Job Order")}
diff --git a/src/components/ProductionProcess/ProductionProcessPage.tsx b/src/components/ProductionProcess/ProductionProcessPage.tsx
index 4ec33968..19e6d2fe 100644
--- a/src/components/ProductionProcess/ProductionProcessPage.tsx
+++ b/src/components/ProductionProcess/ProductionProcessPage.tsx
@@ -17,6 +17,7 @@ import DrinkProductionQtyDashboard from "@/components/ProductionProcess/DrinkPro
 import JobOrderOpsTable from "@/components/ProductionProcess/JobOrderOpsTable";
 import type { PrinterCombo } from "@/app/api/settings/printer";
 import { useTranslation } from "react-i18next";
+import { AUTH, hasAbility } from "@/authorities";
 
 interface ProductionProcessPageProps {
   printerCombo: PrinterCombo[];
@@ -24,9 +25,17 @@ interface ProductionProcessPageProps {
 
 const STORAGE_KEY = 'productionProcess_selectedMatchingStock';
 
+type PageTab =
+  | "list"
+  | "ops"
+  | "jobProcessStatus"
+  | "operatorKpi"
+  | "equipmentStatus"
+  | "drinkQty";
+
 /**
  * FP-MTMS Version Checklist | Functions Ref. No. 26 | v1.0.0 | 2026-07-20
- * 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 ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCombo }) => {
   const { t } = useTranslation(["common", "productionProcess"]);
@@ -36,19 +45,27 @@ const ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCo
     productProcessId: number;
     pickOrderId: number;
   } | null>(null);
-  /** 0 = Production Process list; 1 = JO ops table; 2..5 = dashboards */
-  const [tabIndex, setTabIndex] = useState(0);
+  const [pageTab, setPageTab] = useState<PageTab>("list");
   const [productionListState, setProductionListState] = useState(() => ({
     ...createDefaultProductionProcessListPersistedState(),
   }));
   const { data: session } = useSession() as { data: SessionWithTokens | null };
   const sessionToken = session as SessionWithTokens | null;
+  const abilities = session?.abilities ?? session?.user?.abilities ?? [];
+  /** 「查看工單流程情況」僅 ADMIN */
+  const canSeeOpsTable = hasAbility(abilities, AUTH.ADMIN);
   const searchParams = useSearchParams();
   const pathname = usePathname();
   const router = useRouter();
   const [linkQcOpen, setLinkQcOpen] = useState(false);
   const [linkQcSilId, setLinkQcSilId] = useState<number | null>(null);
 
+  useEffect(() => {
+    if (!canSeeOpsTable && pageTab === "ops") {
+      setPageTab("list");
+    }
+  }, [canSeeOpsTable, pageTab]);
+
   useEffect(() => {
     if (typeof window !== 'undefined') {
       try {
@@ -83,8 +100,8 @@ const ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCo
     }
   }, []);
 
-  const handleTabChange = useCallback((event: React.SyntheticEvent, newValue: number) => {
-    setTabIndex(newValue);
+  const handleTabChange = useCallback((_: React.SyntheticEvent, newValue: PageTab) => {
+    setPageTab(newValue);
   }, []);
 
   const openStockInLineIdQ = searchParams.get("openStockInLineId");
@@ -100,7 +117,7 @@ const ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCo
     if (!Number.isFinite(id) || id <= 0) return;
     setSelectedProcessId(null);
     setSelectedMatchingStock(null);
-    setTabIndex(0);
+    setPageTab("list");
     setProductionListState((prev) => ({
       ...prev,
       pickBucket: "pending_qc",
@@ -144,16 +161,18 @@ const ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCo
   return (
     <>
     <Box>
-      <Tabs value={tabIndex} onChange={handleTabChange} sx={{ mb: 2 }}>
-        <Tab label={t("Production Process")} />
-        <Tab label={t("Job Order Ops Table")} />
-        <Tab label={t("Job Process Status Dashboard")} />
-        <Tab label={t("Operator KPI Dashboard")} />
-        <Tab label={t("Production Equipment Status Dashboard")} />
-        <Tab label={t("Drink Production Qty Dashboard")} />
+      <Tabs value={pageTab} onChange={handleTabChange} sx={{ mb: 2 }}>
+        <Tab value="list" label={t("Production Process")} />
+        {canSeeOpsTable && (
+          <Tab value="ops" label={t("Job Order Ops Table")} />
+        )}
+        <Tab value="jobProcessStatus" label={t("Job Process Status Dashboard")} />
+        <Tab value="operatorKpi" label={t("Operator KPI Dashboard")} />
+        <Tab value="equipmentStatus" label={t("Production Equipment Status Dashboard")} />
+        <Tab value="drinkQty" label={t("Drink Production Qty Dashboard")} />
       </Tabs>
 
-      {tabIndex === 0 && (
+      {pageTab === "list" && (
         <ProductionProcessList
           printerCombo={printerCombo}
           listPersistedState={productionListState}
@@ -174,7 +193,7 @@ const ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCo
         />
       )}
 
-      {tabIndex === 1 && (
+      {pageTab === "ops" && canSeeOpsTable && (
         <JobOrderOpsTable
           printerCombo={printerCombo}
           onSelectProcess={(jobOrderId) => {
@@ -183,16 +202,16 @@ const ProductionProcessPage: React.FC<ProductionProcessPageProps> = ({ printerCo
         />
       )}
 
-      {tabIndex === 2 && (
+      {pageTab === "jobProcessStatus" && (
         <JobProcessStatus />
       )}
-      {tabIndex === 3 && (
+      {pageTab === "operatorKpi" && (
         <OperatorKpiDashboard />
       )}
-      {tabIndex === 4 && (
+      {pageTab === "equipmentStatus" && (
         <EquipmentStatusDashboard />
       )}
-      {tabIndex === 5 && (
+      {pageTab === "drinkQty" && (
         <DrinkProductionQtyDashboard />
       )}
     </Box>
diff --git a/src/i18n/en/productionProcess.json b/src/i18n/en/productionProcess.json
index 6c7cec75..4668f623 100644
--- a/src/i18n/en/productionProcess.json
+++ b/src/i18n/en/productionProcess.json
@@ -79,11 +79,11 @@
   "Issue": "Issue",
   "Job Order Ops Table": "Job Order Ops Table",
   "Pending (picked)": "Picked",
-  "Pending (not picked)": "Not picked",
+  "Pending (not picked)": "Pick incomplete",
   "Processing (picked)": "Picked",
-  "Processing (not picked)": "Not picked",
+  "Processing (not picked)": "Pick incomplete",
   "Picked": "Picked",
-  "Not picked": "Not picked",
+  "Not picked": "Pick incomplete",
   "Stop (paused)": "Stop (paused)",
   "Cancelled": "Cancelled",
   "Reload data": "Reload data",
@@ -224,10 +224,10 @@
   "Off-plan unfinished": "Off-plan unfinished",
   "All unfinished": "Needs action",
   "Needs action": "Needs action",
-  "Not picked · Not started": "Not picked · Not started",
+  "Not picked · Not started": "Pick incomplete · Not started",
   "Picked · Not started": "Picked · Not started",
   "Picked · In production": "Picked · In production",
-  "Not picked · In production": "Not picked · In production",
+  "Not picked · In production": "Pick incomplete · In production",
   "Powder_Mixture": "Powder Mixture",
   "Processing": "Processing",
   "Total lines: ": "Total lines: ",
diff --git a/src/i18n/zh/productionProcess.json b/src/i18n/zh/productionProcess.json
index be9f2ae7..f78826f1 100644
--- a/src/i18n/zh/productionProcess.json
+++ b/src/i18n/zh/productionProcess.json
@@ -79,11 +79,11 @@
   "Issue": "異常",
   "Job Order Ops Table": "工單生產流程",
   "Pending (picked)": "已提料",
-  "Pending (not picked)": "未提料",
+  "Pending (not picked)": "未完成提料",
   "Processing (picked)": "已提料",
-  "Processing (not picked)": "未提料",
+  "Processing (not picked)": "未完成提料",
   "Picked": "已提料",
-  "Not picked": "未提料",
+  "Not picked": "未完成提料",
   "Stop (paused)": "暫停中",
   "Cancelled": "已取消",
   "Reload data": "重新載入",
@@ -224,10 +224,10 @@
   "Off-plan unfinished": "未按規劃完成工單",
   "All unfinished": "需處理",
   "Needs action": "需處理",
-  "Not picked · Not started": "未提料 · 未開工",
+  "Not picked · Not started": "未完成提料 · 未開工",
   "Picked · Not started": "已提料 · 未開工",
   "Picked · In production": "已提料 · 未完成生產",
-  "Not picked · In production": "未提料 · 未完成生產",
+  "Not picked · In production": "未完成提料 · 未完成生產",
   "Powder_Mixture": "箱料粉",
   "Processing": "生產中",
   "Total lines: ": "總數量:",