diff --git a/src/components/JoSearch/JoSearch.tsx b/src/components/JoSearch/JoSearch.tsx index feb97a5..be87dba 100644 --- a/src/components/JoSearch/JoSearch.tsx +++ b/src/components/JoSearch/JoSearch.tsx @@ -293,10 +293,11 @@ const JoSearch: React.FC = ({ defaultInputs, bomCombo, printerCombo }) => const searchDataByPage = useCallback(() => { refetchData(inputs, "paging"); }, [inputs,refetchData]) + /* useEffect(() => { searchDataByPage(); }, [pagingController,searchDataByPage ]); - + */ const getButtonSx = (jo : JobOrder) => { // TODO put it in ActionButtons.ts const joStatus = jo.status?.toLowerCase(); const silStatus = jo.stockInLineStatus?.toLowerCase(); diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx index 04e099b..38c53a7 100644 --- a/src/components/NavigationContent/NavigationContent.tsx +++ b/src/components/NavigationContent/NavigationContent.tsx @@ -205,12 +205,12 @@ const NavigationContent: React.FC = () => { }, { icon: , - label: "Job Order", + label: "Management Job Order", path: "", children: [ { icon: , - label: "Job Order", + label: "Search Job Order/ Create Job Order", path: "/jo", }, { diff --git a/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx b/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx index 0ebd1a0..d9a29e6 100644 --- a/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx +++ b/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx @@ -238,7 +238,7 @@ const handleRelease = useCallback(async ( jobOrderId: number) => { label={t("Is Dark | Dense | Float| Scrap Rate| Allergic Substance")} fullWidth disabled={true} - value={`${processData?.isDark == null || processData?.isDark === "" ? t("N/A") : processData.isDark} | ${processData?.isDense == null || processData?.isDense === "" || processData?.isDense === 0 ? t("N/A") : processData.isDense} | ${processData?.isFloat == null || processData?.isFloat === "" ? t("N/A") : processData.isFloat} | ${t("N/A")} | ${t("N/A")}`} + value={`${processData?.isDark == null || processData?.isDark === "" ? t("N/A") : processData.isDark} | ${processData?.isDense == null || processData?.isDense === "" || processData?.isDense === 0 ? t("N/A") : processData.isDense} | ${processData?.isFloat == null || processData?.isFloat === "" ? t("N/A") : processData.isFloat} | ${processData?.scrapRate == -1 || processData?.scrapRate === "" ? t("N/A") : processData.scrapRate} | ${processData?.allergicSubstance == null || processData?.allergicSubstance === "" ? t("N/A") :t (processData.allergicSubstance)}`} /> diff --git a/src/i18n/zh/common.json b/src/i18n/zh/common.json index 56fe019..d94dbfa 100644 --- a/src/i18n/zh/common.json +++ b/src/i18n/zh/common.json @@ -99,11 +99,14 @@ "Production": "生產流程", "Put Away": "上架", "Put Away Scan": "上架掃碼", + "Management Job Order": "管理工單", + "Search Job Order/ Create Job Order": "搜尋工單/ 建立工單", "Finished Good Order": "成品出倉", "finishedGood": "成品", "Router": "執貨路線", "Job Order Pickexcution": "工單提料", "No data available": "沒有資料", + "Job Type": "工單類型", "Start Scan": "開始掃碼", "Stop Scan": "停止掃碼", "Scan Result": "掃碼結果",