Browse Source

update

master
cyril.tsui 1 week ago
parent
commit
6fdb5574a8
4 changed files with 15 additions and 5 deletions
  1. +4
    -1
      src/components/PoDetail/PoDetail.tsx
  2. +1
    -1
      src/i18n/zh/common.json
  3. +2
    -2
      src/i18n/zh/inventory.json
  4. +8
    -1
      src/theme/devias-material-kit/components.ts

+ 4
- 1
src/components/PoDetail/PoDetail.tsx View File

@@ -447,6 +447,8 @@ const PoDetail: React.FC<Props> = ({ po, qc, warehouse }) => {
} }
// setPolInputList(() => temp) // setPolInputList(() => temp)
}, 300), [rowIndex]); }, 300), [rowIndex]);

const purchaseToStockRatio = (row.stockUom.purchaseRatioN ?? 1) / (row.stockUom.purchaseRatioD ?? 1) * (row.stockUom.stockRatioD ?? 1) / (row.stockUom.stockRatioN ?? 1)
return ( return (
<> <>
<TableRow <TableRow
@@ -477,7 +479,8 @@ const PoDetail: React.FC<Props> = ({ po, qc, warehouse }) => {
<TableCell align="right">{integerFormatter.format(row.qty)}</TableCell> <TableCell align="right">{integerFormatter.format(row.qty)}</TableCell>
<TableCell align="right">{integerFormatter.format(processedQty)}</TableCell> <TableCell align="right">{integerFormatter.format(processedQty)}</TableCell>
<TableCell align="left">{row.uom?.code}</TableCell> <TableCell align="left">{row.uom?.code}</TableCell>
<TableCell align="right">{decimalFormatter.format(row.stockUom.stockQty)}</TableCell>
{/* <TableCell align="right">{decimalFormatter.format(row.stockUom.stockQty)}</TableCell> */}
<TableCell align="right">{decimalFormatter.format(row.stockInLine.filter((sil) => sil.purchaseOrderLineId === row.id).reduce((acc, cur) => acc + (cur.acceptedQty ?? 0),0) * purchaseToStockRatio)}</TableCell>
<TableCell align="left">{row.stockUom.stockUomCode}</TableCell> <TableCell align="left">{row.stockUom.stockUomCode}</TableCell>
{/* <TableCell align="right"> {/* <TableCell align="right">
{decimalFormatter.format(totalWeight)} {weightUnit} {decimalFormatter.format(totalWeight)} {weightUnit}


+ 1
- 1
src/i18n/zh/common.json View File

@@ -40,7 +40,7 @@
"non-consumables": "非消耗品", "non-consumables": "非消耗品",
"fg": "成品", "fg": "成品",
"sfg": "半成品", "sfg": "半成品",
"item": "品",
"item": "品",
"FG":"成品", "FG":"成品",
"FG & Material Demand Forecast Detail":"成品及材料需求預測詳情", "FG & Material Demand Forecast Detail":"成品及材料需求預測詳情",
"View item In-out And inventory Ledger":"查看物料出入庫及庫存日誌", "View item In-out And inventory Ledger":"查看物料出入庫及庫存日誌",


+ 2
- 2
src/i18n/zh/inventory.json View File

@@ -15,6 +15,6 @@
"Base UoM": "基本單位", "Base UoM": "基本單位",
"Lot No": "批號", "Lot No": "批號",
"Expiry Date": "到期日", "Expiry Date": "到期日",
"No items are selected yet.": "未選擇項目",
"Item selected": "已選擇項目"
"No items are selected yet.": "未選擇貨品",
"Item selected": "已選擇貨品"
} }

+ 8
- 1
src/theme/devias-material-kit/components.ts View File

@@ -314,7 +314,7 @@ const components: ThemeOptions["components"] = {
styleOverrides: { styleOverrides: {
root: { root: {
borderBottomColor: palette.divider, borderBottomColor: palette.divider,
padding: "1px 6px",
padding: "10px 6px",
fontSize: defaultFontSize - 2, fontSize: defaultFontSize - 2,
// padding: "15px 16px", // padding: "15px 16px",
// lineHeight: 1.5, // lineHeight: 1.5,
@@ -342,6 +342,13 @@ const components: ThemeOptions["components"] = {
}, },
}, },
}, },
// MuiTableFooter: {
// styleOverrides: {
// root: {
// padding: "1px 6px",
// },
// },
// },
MuiTextField: { MuiTextField: {
defaultProps: { defaultProps: {
variant: "filled", variant: "filled",


Loading…
Cancel
Save