commit

src/components/JoSearch/JoSearch.tsx

@@ -293,10 +293,11 @@ const JoSearch: React.FC<Props> = ({ 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();

src/components/NavigationContent/NavigationContent.tsx

@@ -205,12 +205,12 @@ const NavigationContent: React.FC = () => {
     },
     {
       icon: <RequestQuote />,
-      label: "Job Order",
+      label: "Management Job Order",
       path: "",
       children: [
         {
           icon: <RequestQuote />,
-          label: "Job Order",
+          label: "Search Job Order/ Create Job Order",
           path: "/jo",
         },
         {

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)}`}
               />
             </Grid>
 

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": "掃碼結果",