diff --git a/src/components/PoDetail/PoDetail.tsx b/src/components/PoDetail/PoDetail.tsx index 2c59d5f..3422b9a 100644 --- a/src/components/PoDetail/PoDetail.tsx +++ b/src/components/PoDetail/PoDetail.tsx @@ -447,6 +447,8 @@ const PoDetail: React.FC = ({ po, qc, warehouse }) => { } // setPolInputList(() => temp) }, 300), [rowIndex]); + + const purchaseToStockRatio = (row.stockUom.purchaseRatioN ?? 1) / (row.stockUom.purchaseRatioD ?? 1) * (row.stockUom.stockRatioD ?? 1) / (row.stockUom.stockRatioN ?? 1) return ( <> = ({ po, qc, warehouse }) => { {integerFormatter.format(row.qty)} {integerFormatter.format(processedQty)} {row.uom?.code} - {decimalFormatter.format(row.stockUom.stockQty)} + {/* {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} {/* {decimalFormatter.format(totalWeight)} {weightUnit} diff --git a/src/i18n/zh/common.json b/src/i18n/zh/common.json index 82f1be2..66be037 100644 --- a/src/i18n/zh/common.json +++ b/src/i18n/zh/common.json @@ -40,7 +40,7 @@ "non-consumables": "非消耗品", "fg": "成品", "sfg": "半成品", - "item": "物品", + "item": "貨品", "FG":"成品", "FG & Material Demand Forecast Detail":"成品及材料需求預測詳情", "View item In-out And inventory Ledger":"查看物料出入庫及庫存日誌", diff --git a/src/i18n/zh/inventory.json b/src/i18n/zh/inventory.json index ec54564..14a30a8 100644 --- a/src/i18n/zh/inventory.json +++ b/src/i18n/zh/inventory.json @@ -15,6 +15,6 @@ "Base UoM": "基本單位", "Lot No": "批號", "Expiry Date": "到期日", - "No items are selected yet.": "未選擇項目", - "Item selected": "已選擇項目" + "No items are selected yet.": "未選擇貨品", + "Item selected": "已選擇貨品" } \ No newline at end of file diff --git a/src/theme/devias-material-kit/components.ts b/src/theme/devias-material-kit/components.ts index 61e3f52..50595ad 100644 --- a/src/theme/devias-material-kit/components.ts +++ b/src/theme/devias-material-kit/components.ts @@ -314,7 +314,7 @@ const components: ThemeOptions["components"] = { styleOverrides: { root: { borderBottomColor: palette.divider, - padding: "1px 6px", + padding: "10px 6px", fontSize: defaultFontSize - 2, // padding: "15px 16px", // lineHeight: 1.5, @@ -342,6 +342,13 @@ const components: ThemeOptions["components"] = { }, }, }, + // MuiTableFooter: { + // styleOverrides: { + // root: { + // padding: "1px 6px", + // }, + // }, + // }, MuiTextField: { defaultProps: { variant: "filled",