From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/stockItem/StockItemPanel.jsx | 140 ++++++++++++++++------------------------------
1 files changed, 49 insertions(+), 91 deletions(-)
diff --git a/rsf-admin/src/page/stockItem/StockItemPanel.jsx b/rsf-admin/src/page/stockItem/StockItemPanel.jsx
index bd73f01..6f0fda6 100644
--- a/rsf-admin/src/page/stockItem/StockItemPanel.jsx
+++ b/rsf-admin/src/page/stockItem/StockItemPanel.jsx
@@ -23,7 +23,7 @@
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
- {Common.camelToPascalWithSpaces(translate('table.field.stockItem.matnrk'))}: {record.matnrk}
+ {Common.camelToPascalWithSpaces(translate('table.field.stockItem.id'))}: {record.id}
</Typography>
{/* inherit, primary, secondary, textPrimary, textSecondary, error */}
<Typography variant="h6" gutterBottom align="right" >
@@ -43,25 +43,37 @@
<Grid item xs={6}>
<PanelTypography
title="table.field.stockItem.stockId"
- property={record.stockId$}
+ property={record.stockId}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.stockItem.stockCode"
+ property={record.stockCode}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.stockItem.sourceItemId"
+ property={record.sourceItemId}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
title="table.field.stockItem.matnrId"
- property={record.matnrId$}
+ property={record.matnrId}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.code"
- property={record.code}
+ title="table.field.stockItem.matnrCode"
+ property={record.matnrCode}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.matnrk"
- property={record.matnrk}
+ title="table.field.stockItem.maktx"
+ property={record.maktx}
/>
</Grid>
<Grid item xs={6}>
@@ -72,8 +84,26 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
+ title="table.field.stockItem.stockUnit"
+ property={record.stockUnit}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
title="table.field.stockItem.workQty"
property={record.workQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.stockItem.purQty"
+ property={record.purQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.stockItem.purUnit"
+ property={record.purUnit}
/>
</Grid>
<Grid item xs={6}>
@@ -84,32 +114,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.weight"
- property={record.weight}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.unit"
- property={record.unit}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.shipperId"
- property={record.shipperId$}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.splrId"
- property={record.splrId}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.brand"
- property={record.brand}
+ title="table.field.stockItem.splrCode"
+ property={record.splrCode}
/>
</Grid>
<Grid item xs={6}>
@@ -120,50 +126,20 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.prodTime"
- property={record.prodTime}
+ title="table.field.stockItem.splrBatch"
+ property={record.splrBatch}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.inspectId"
- property={record.inspectId$}
+ title="table.field.stockItem.splrName"
+ property={record.splrName}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.splrBtch"
- property={record.splrBtch}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.asnOrder"
- property={record.asnOrder}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.erpToken"
- property={record.erpToken}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.erpOrder"
- property={record.erpOrder}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.erpStkAdr"
- property={record.erpStkAdr}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.locId"
- property={record.locId$}
+ title="table.field.stockItem.trackCode"
+ property={record.trackCode}
/>
</Grid>
<Grid item xs={6}>
@@ -174,32 +150,14 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.purPrice"
- property={record.purPrice}
+ title="table.field.stockItem.prodTime"
+ property={record.prodTime}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.stockItem.lockReason"
- property={record.lockReason}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.lockStatus"
- property={record.lockStatus}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.locker"
- property={record.locker}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.stockItem.lockedTime"
- property={record.lockedTime$}
+ title="table.field.stockItem.packName"
+ property={record.packName}
/>
</Grid>
--
Gitblit v1.9.1