diff --git a/src/components/ProductionProcess/JobOrderOpsTable.tsx b/src/components/ProductionProcess/JobOrderOpsTable.tsx index bb27757..f472352 100644 --- a/src/components/ProductionProcess/JobOrderOpsTable.tsx +++ b/src/components/ProductionProcess/JobOrderOpsTable.tsx @@ -167,6 +167,7 @@ interface JobOrderOpsTableProps { printerCombo?: PrinterCombo[]; } +/** FP-MTMS Version Checklist | Functions Ref. No. 47 | v1.0.1 | 2026-08-05 */ const JobOrderOpsTable: React.FC = ({ onSelectProcess, printerCombo = [], @@ -517,17 +518,49 @@ const JobOrderOpsTable: React.FC = ({ scrollButtons="auto" sx={{ mb: 1, borderBottom: 1, borderColor: "divider" }} > - - - + 0 ? `${t("All")} (${counts.all})` : t("All")} + /> + 0 + ? `${t("pending")} (${counts.pending})` + : t("pending") + } + /> + 0 + ? `${t("Processing")} (${counts.processing})` + : t("Processing") + } + /> 0 + ? `${t("Waiting QC Put Away")} (${counts.pendingQc})` + : t("Waiting QC Put Away") + } + /> + 0 + ? `${t("Put Awayed")} (${counts.putawayed})` + : t("Put Awayed") + } /> - 0 + ? `${t("Issue")} (${counts.stop + counts.cancel})` + : t("Issue") + } /> @@ -561,8 +594,22 @@ const JobOrderOpsTable: React.FC = ({ onChange={(_, v: IssueSubTab) => setIssueSub(v)} sx={{ mb: 2 }} > - - + 0 + ? `${t("Stop (paused)")} (${counts.stop})` + : t("Stop (paused)") + } + /> + 0 + ? `${t("Cancelled")} (${counts.cancel})` + : t("Cancelled") + } + /> )} @@ -576,8 +623,8 @@ const JobOrderOpsTable: React.FC = ({ - {t("Job Order")} - {t("Item")} + {t("Job Order Code")} + {t("Item Code")} {t("Required Qty")} {t("Production Date")} {t("Status")} diff --git a/src/components/ProductionProcess/ProductionProcessList.tsx b/src/components/ProductionProcess/ProductionProcessList.tsx index 7ec8e83..a5b6955 100644 --- a/src/components/ProductionProcess/ProductionProcessList.tsx +++ b/src/components/ProductionProcess/ProductionProcessList.tsx @@ -22,7 +22,6 @@ import { DialogActions, Tabs, Tab, - Badge, Tooltip, IconButton, Avatar, @@ -145,7 +144,7 @@ function normalizeListTab(raw: string | undefined | null): ProductionProcessList return "needs_action"; } -/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.0 | 2026-08-03 */ +/** FP-MTMS Version Checklist | Functions Ref. No. 40 | v1.0.2 | 2026-08-05 */ const ProductProcessList: React.FC = ({ onSelectProcess, printerCombo, @@ -578,38 +577,8 @@ const ProductProcessList: React.FC = ({ }, [loading, filteredProcesses, totalPages]); // eslint-disable-line react-hooks/exhaustive-deps const renderBucketTabLabel = useCallback( - (labelKey: string, count: number) => ( - 0 ? t(labelKey) + `: ${count}` : t(labelKey)}> - - 99 ? "99+" : count} - invisible={count === 0} - sx={{ - "& .MuiBadge-badge": { - fontWeight: 800, - fontSize: "0.7rem", - minWidth: 18, - height: 18, - lineHeight: "18px", - px: 0.5, - right: -8, - top: 2, - }, - }} - > - 0 ? 1 : 0 }} - > - {t(labelKey)} - - - - - ), + (labelKey: string, count: number) => + count > 0 ? `${t(labelKey)} (${count})` : t(labelKey), [t], ); const handleUpdateJo = useCallback(async (process: AllJoborderProductProcessInfoResponse) => { @@ -822,17 +791,14 @@ const ProductProcessList: React.FC = ({ 0 ? 4 : 2 }} /> 0 ? 4 : 2 }} /> 0 ? 4 : 2 }} /> = ({ "Waiting QC Put Away", pendingQcCount, )} - sx={{ pr: pendingQcCount > 0 ? 4 : 2 }} /> 0 ? 4 : 2 }} /> diff --git a/src/i18n/zh/productionProcess.json b/src/i18n/zh/productionProcess.json index 3f378f6..81f6749 100644 --- a/src/i18n/zh/productionProcess.json +++ b/src/i18n/zh/productionProcess.json @@ -77,7 +77,7 @@ "Job Order No.": "工單編號", "Job Order and Product": "工單及貨品", "Issue": "異常", - "Job Order Ops Table": "查看工單流程情況", + "Job Order Ops Table": "工單流程", "Pending (picked)": "已提料", "Pending (not picked)": "未提料", "Processing (picked)": "已提料", @@ -148,7 +148,7 @@ "Processing Time": "生產時間", "Processing Time (mins)": "步驟時間(分鐘)", "Product process status": "生產流程狀態", - "Production Date": "生產日期", + "Production Date": "預計生產日期", "Production Equipment Status Dashboard": "儀表板 - 生產設備最新狀態", "Production Output Data": "生產輸出數據", "Production Output Data Entry": "生產輸出數據輸入", @@ -158,7 +158,7 @@ "Production Process Line Remark": "工藝明細", "Production Process Steps": "生產流程步驟", "Production Time Remaining": "生產剩餘時間", - "Production date": "生產日期", + "Production date": "預計生產日期", "Put Awayed Job Orders": "已上架工單", "Qty": "數量", "Quality Check": "品質檢查", @@ -212,8 +212,8 @@ "Total Time": "總時間", "Total finished QC job orders": "總完成QC工單數量", "Total job orders": "總工單數量", - "Including carried over": "含過去轉來", - "Carried over from past day": "過去轉來的工單", + "Including carried over": "含未按規劃完成工單", + "Carried over from past day": "未按規劃完成工單的工單", "All unfinished": "需處理", "Needs action": "需處理", "Not picked · Not started": "未提料 · 未開工",