JO Pick UI update

src/components/JoSearch/JoSearch.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 import { Criterion } from "../SearchBox";
 import SearchResults, { Column, defaultPagingController } from "../SearchResults/SearchResults";
 import { EditNote } from "@mui/icons-material";
-import { arrayToDateString, arrayToDateTimeString, integerFormatter } from "@/app/utils/formatUtil";
+import { arrayToDateString, arrayToDateTimeString, integerFormatter, dayjsToDateString } from "@/app/utils/formatUtil";
 import { orderBy, uniqBy, upperFirst } from "lodash";
 import SearchBox from "../SearchBox/SearchBox";
 import { useRouter } from "next/navigation";
@@ -139,7 +139,7 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo }) =>
     const searchCriteria: Criterion<SearchParamNames>[] = useMemo(() => [
         { label: t("Code"), paramName: "code", type: "text" },
         { label: t("Item Name"), paramName: "itemName", type: "text" },
-        { label: t("Plan Start"), label2: t("Plan Start To"), paramName: "planStart", type: "datetimeRange" },
+        { label: t("Plan Start"), label2: t("Plan Start To"), paramName: "planStart", type: "dateRange", preFilledValue: dayjsToDateString(dayjs(), "input") },
     ], [t])
 
     const columns = useMemo<Column<JobOrder>[]>(
@@ -151,16 +151,9 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo }) =>
             },
             {
                 name: "item",
-                label: t("Item Code"),
+                label: `${t("Item Name")}`,
                 renderCell: (row) => {
-                    return row.item ? t(row.item.code) : '-'
-                }
-            },
-            {
-                name: "itemName",
-                label: t("Item Name"),
-                renderCell: (row) => {
-                    return row.item ? t(row.item.name) : '-'
+                    return row.item ? <>{t(row.item.code)} {t(row.item.name)}</> : '-'
                 }
             },
             {
@@ -195,7 +188,7 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo }) =>
                 align: "left",
                 headerAlign: "left",
                 renderCell: (row) => {
-                    return row.planStart ? arrayToDateTimeString(row.planStart) : '-'
+                    return row.planStart ? arrayToDateString(row.planStart) : '-'
                 }
             },
             {
@@ -233,7 +226,7 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo }) =>
                     )
                 }
             },
-        ], [inventoryData]
+        ], [inventoryData, detailedJos]
     )
 
     const handleUpdate = useCallback(async (jo: JobOrder) => {
@@ -364,14 +357,21 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo }) =>
         refetchData(defaultInputs, "search");
     }, []);
 
+
     const onSearch = useCallback((query: Record<SearchParamNames, string>) => {
+        const transformedQuery = {
+            ...query,
+            planStart: query.planStart ? `${query.planStart}T00:00:00` : query.planStart,
+            planStartTo: query.planStartTo ? `${query.planStartTo}T23:59:59` : query.planStartTo
+        };
+        
         setInputs(() => ({
-            code: query.code,
-            itemName: query.itemName,
-            planStart: query.planStart,
-            planStartTo: query.planStartTo
+            code: transformedQuery.code,
+            itemName: transformedQuery.itemName,
+            planStart: transformedQuery.planStart,
+            planStartTo: transformedQuery.planStartTo
         }))
-        refetchData(query, "search");
+        refetchData(transformedQuery, "search");
     }, [])
 
     const onReset = useCallback(() => {

src/i18n/zh/jo.json

@@ -1,6 +1,6 @@
 {
   "Job Order": "工單",
-  "Create Job Order": "創建工單",
+  "Create Job Order": "建立工單",
   "Edit Job Order Detail": "工單詳情",
   "Details": "細節",
   "Actions": "操作",
@@ -28,7 +28,7 @@
   "scan picked material": "掃碼確認提料",
   "escalation processing": "處理上報記錄",
   "process stockIn": "進行收貨程序",
-  "release jo": "確認發佈工單",
+  "release jo": "工單詳情",
   "complete jo": "完成工單",
   "update success": "成功更新資料",
   "Scanned": "已掃碼",
@@ -37,13 +37,13 @@
   "Target Production Date": "預計生產日期",
   "Production Priority": "生產優先度",
   "Sequence": "序",
-  "Item Code": "物料編號",
+  "Item Code": "成品/半成品編號",
   "Stock Available": "倉庫可用數",
   "Stock Status": "可提料",
   "Total lines: ": "所需貨品項目數量： ",
   "Lines with sufficient stock: ": "可提料項目數量： ",
   "Lines with insufficient stock: ": "未能提料項目數量： ",
-  "Item Name": "物料名稱",
+  "Item Name": "成品/半成品",
   "Job Order Pickexcution": "工單提料",
   "Pick Order Detail": "提料單細節",
   "Finished Job Order Record": "已完成工單記錄",
@@ -238,7 +238,7 @@
   "bind": "綁定",
   "expiryDate": "有效期",
   "itemName": "物料名稱",
-  "itemNo": "物料編號",
+  "itemNo": "成品編號",
   "not default warehosue": "不是默認倉庫",
   "printQty": "打印數量",
   "productionDate": "生產日期",
@@ -271,8 +271,8 @@
   "success": "成功",
   "Total (Verified + Bad + Missing) must equal Required quantity": "驗證數量 + 不良數量 + 缺失數量必須等於需求數量",
   "BOM Status": "材料預備狀況",
-  "Estimated Production Date": "預計生產日期及時間",
-  "Plan Start": "預計生產日期及時間",
-  "Plan Start From": "預計生產日期及時間",
-  "Plan Start To": "預計生產日期及時間至"
+  "Estimated Production Date": "預計生產日期",
+  "Plan Start": "預計生產日期",
+  "Plan Start From": "預計生產日期",
+  "Plan Start To": "預計生產日期"
 }