From 8b46ff43b6dde9592da27f9ff100f68eda0c79d4 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Tue, 2 Sep 2025 15:59:07 +0800 Subject: [PATCH] update uom code -> desc --- src/app/api/settings/uom/index.ts | 2 +- src/components/PoDetail/EscalationForm.tsx | 2 +- src/components/PoDetail/PoDetail.tsx | 4 ++-- src/components/PoDetail/PoInputGrid.tsx | 4 ++-- src/components/PoDetail/StockInFormVer2.tsx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/api/settings/uom/index.ts b/src/app/api/settings/uom/index.ts index 319ac11..e7e8526 100644 --- a/src/app/api/settings/uom/index.ts +++ b/src/app/api/settings/uom/index.ts @@ -8,7 +8,7 @@ import { BASE_API_URL } from "../../../../config/api"; export interface Uom { id: number; code: string; - name: string; + udfudesc: string; unit1: string; unit1Qty: number; unit2?: string; diff --git a/src/components/PoDetail/EscalationForm.tsx b/src/components/PoDetail/EscalationForm.tsx index d73768d..a8b9cd3 100644 --- a/src/components/PoDetail/EscalationForm.tsx +++ b/src/components/PoDetail/EscalationForm.tsx @@ -141,7 +141,7 @@ const EscalationForm: React.FC = ({ label={t("uom")} fullWidth disabled={true} - defaultValue={itemDetail.uom.code} + defaultValue={itemDetail?.uom?.udfudesc} /> diff --git a/src/components/PoDetail/PoDetail.tsx b/src/components/PoDetail/PoDetail.tsx index 2071652..c49eb57 100644 --- a/src/components/PoDetail/PoDetail.tsx +++ b/src/components/PoDetail/PoDetail.tsx @@ -510,10 +510,10 @@ const PoDetail: React.FC = ({ po, qc, warehouse, printerCombo }) => { {row.itemName} {integerFormatter.format(row.qty)} {integerFormatter.format(row.processed)} - {row.uom?.code} + {row.uom?.udfudesc} {/* {decimalFormatter.format(row.stockUom.stockQty)} */} {decimalFormatter.format(row.stockInLine.filter((sil) => sil.purchaseOrderLineId === row.id).reduce((acc, cur) => acc + (cur.acceptedQty ?? 0),0) * purchaseToStockRatio)} - {row.stockUom.stockUomCode} + {row.stockUom.stockUomDesc} {/* {decimalFormatter.format(totalWeight)} {weightUnit} */} diff --git a/src/components/PoDetail/PoInputGrid.tsx b/src/components/PoDetail/PoInputGrid.tsx index 0921dd6..cabe035 100644 --- a/src/components/PoDetail/PoInputGrid.tsx +++ b/src/components/PoDetail/PoInputGrid.tsx @@ -531,7 +531,7 @@ const closeNewModal = useCallback(() => { width: 150, // flex: 0.5, renderCell: (params) => { - return params.row.uom?.code; + return params.row.uom?.udfudesc; }, }, { @@ -554,7 +554,7 @@ const closeNewModal = useCallback(() => { width: 150, // flex: 0.5, renderCell: (params) => { - return itemDetail.stockUom.stockUomCode; + return itemDetail.stockUom.stockUomDesc; }, }, // { diff --git a/src/components/PoDetail/StockInFormVer2.tsx b/src/components/PoDetail/StockInFormVer2.tsx index 398e9c7..c168a78 100644 --- a/src/components/PoDetail/StockInFormVer2.tsx +++ b/src/components/PoDetail/StockInFormVer2.tsx @@ -321,7 +321,7 @@ const StockInFormVer2: React.FC = ({