diff --git a/src/components/PoDetail/PoDetail.tsx b/src/components/PoDetail/PoDetail.tsx index 14d2d9c..2c59d5f 100644 --- a/src/components/PoDetail/PoDetail.tsx +++ b/src/components/PoDetail/PoDetail.tsx @@ -113,7 +113,7 @@ const PoSearchList: React.FC<{ }, [poList, searchTerm, t]); return ( - + {t("Purchase Orders")} @@ -486,7 +486,7 @@ const PoDetail: React.FC = ({ po, qc, warehouse }) => { {/* {decimalFormatter.format(row.price)} */} {/* {row.expiryDate} */} {t(`${currStatus.toLowerCase()}`)} - {integerFormatter.format(row.receivedQty)} + {/* {integerFormatter.format(row.receivedQty)} */} = ({ po, qc, warehouse }) => { {true ? ( - + @@ -784,9 +784,9 @@ const PoDetail: React.FC = ({ po, qc, warehouse }) => { {/* {t("total weight")} */} {/* {`${t("price")} (HKD)`} */} {t("status")} - {renderFieldCondition(FIRST_IN_FIELD) ? {t("receivedQty")} : undefined} + {/* {renderFieldCondition(FIRST_IN_FIELD) ? {t("receivedQty")} : undefined} */} {t("productLotNo")} - {renderFieldCondition(SECOND_IN_FIELD) ? {t("dnQty")}(以訂單單位計算) : undefined} + {renderFieldCondition(SECOND_IN_FIELD) ? {t("dnQty")}
(以訂單單位計算)
: undefined} diff --git a/src/components/PoDetail/PoInfoCard.tsx b/src/components/PoDetail/PoInfoCard.tsx index 9d8d7ac..7081556 100644 --- a/src/components/PoDetail/PoInfoCard.tsx +++ b/src/components/PoDetail/PoInfoCard.tsx @@ -29,7 +29,7 @@ const PoInfoCard: React.FC = async ( const { t } = useTranslation("purchaseOrder") return ( <> - + diff --git a/src/components/PoSearch/PoSearch.tsx b/src/components/PoSearch/PoSearch.tsx index 2e85ca2..5d14b8d 100644 --- a/src/components/PoSearch/PoSearch.tsx +++ b/src/components/PoSearch/PoSearch.tsx @@ -1,7 +1,7 @@ "use client"; import { PoResult } from "@/app/api/po"; -import { useCallback, useEffect, useMemo, useState } from "react"; +import React, { useCallback, useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import { useRouter, useSearchParams } from "next/navigation"; import SearchBox, { Criterion } from "../SearchBox"; @@ -111,6 +111,14 @@ const PoSearch: React.FC = ({ } }, [selectedPoIds, router]); + const itemColumn = useCallback((value: string | undefined) => { + if (!value) { + return "N/A" + } + const items = value.split(",") + return items.map((item) => {item}) + }, []) + const columns = useMemo[]>( () => [ { @@ -150,15 +158,50 @@ const PoSearch: React.FC = ({ return <>{arrayToDateString(params.orderDate)}
{arrayToDateString(params.estimatedArrivalDate)} }, }, + // { + // name: "itemDetail", + // label: t("Item Detail"), + // renderCell: (params) => { + // if (!params.itemDetail) { + // return "N/A" + // } + // const items = params.itemDetail.split(",") + // return items.map((item) => {item}) + // }, + // }, + { + name: "itemCode", + label: t("Item Code"), + renderCell: (params) => { + return itemColumn(params.itemCode); + }, + }, + { + name: "itemName", + label: t("Item Name"), + renderCell: (params) => { + return itemColumn(params.itemName); + }, + }, + { + name: "itemQty", + label: t("Item Qty"), + renderCell: (params) => { + return itemColumn(params.itemQty); + }, + }, + { + name: "itemSumAcceptedQty", + label: t("Item Accepted Qty"), + renderCell: (params) => { + return itemColumn(params.itemSumAcceptedQty); + }, + }, { - name: "itemDetail", - label: t("Item Detail"), + name: "itemUom", + label: t("Item Purchase UoM"), renderCell: (params) => { - if (!params.itemDetail) { - return "N/A" - } - const items = params.itemDetail.split(",") - return items.map((item) => {item}) + return itemColumn(params.itemUom); }, }, { diff --git a/src/i18n/zh/inventory.json b/src/i18n/zh/inventory.json index 391d01c..ec54564 100644 --- a/src/i18n/zh/inventory.json +++ b/src/i18n/zh/inventory.json @@ -8,7 +8,7 @@ "UoM": "單位", "mat": "物料", "fg": "成品", - "Available Qty": "可用數量 (倉存單位)", + "Available Qty": "可用數量", "Sales UoM": "銷售單位", "Stock UoM": "庫存單位", "Available Qty Per Smallest Unit": "可用數量 (基本單位)", diff --git a/src/i18n/zh/purchaseOrder.json b/src/i18n/zh/purchaseOrder.json index d60cfab..ed157f3 100644 --- a/src/i18n/zh/purchaseOrder.json +++ b/src/i18n/zh/purchaseOrder.json @@ -31,14 +31,19 @@ "itemNo": "貨品編號", "itemName": "貨品名稱", "Item Detail": "貨品詳情", + "Item Code": "貨品編號", + "Item Name": "貨品名稱", + "Item Qty": "貨品數量", + "Item Accepted Qty": "貨品已收貨數量", + "Item Purchase UoM": "貨品計量單位", "qty": "訂單數量", "uom": "計量單位", "Stock UoM": "庫存單位", - "Stock In Qty": "入庫數量", + "Stock In Qty": "收貨數量", "total weight": "總重量", "weight unit": "重量單位", "price": "訂單貨值", - "processed": "已處理數量", + "processed": "已上架數量", "expiryDate": "到期日", "acceptedQty": "是次來貨數量", "putawayQty": "上架數量",