From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/matnr/MatnrCreate.jsx | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrCreate.jsx b/rsf-admin/src/page/matnr/MatnrCreate.jsx
index ba9f72a..0d7a4cc 100644
--- a/rsf-admin/src/page/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/matnr/MatnrCreate.jsx
@@ -85,6 +85,21 @@
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.name"
+ source="name"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.code"
+ source="code"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="shipperId"
reference="shipper"
@@ -97,26 +112,24 @@
</ReferenceInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.matnr.name"
- source="name"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.matnr.code"
- source="code"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="groupId"
reference="matnrGroup"
>
<AutocompleteInput
label="table.field.matnr.groupId"
+ optionText="code"
+ filterToQuery={(val) => ({ code: val })}
+ />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput
+ source="rglarId"
+ reference="rglarId"
+ >
+ <AutocompleteInput
+ label="table.field.matnr.rglarId"
optionText="code"
filterToQuery={(val) => ({ code: val })}
/>
@@ -165,8 +178,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnr.desc"
- source="desc"
+ label="table.field.matnr.describle"
+ source="describle"
parse={v => v}
/>
</Grid>
@@ -185,7 +198,7 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnr.purchaseUnit"
+ label="table.field.matnr.purUnit"
source="purchaseUnit"
parse={v => v}
/>
@@ -199,8 +212,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
- label="table.field.matnr.stockLeval"
- source="stockLeval"
+ label="table.field.matnr.stockLevel"
+ source="stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -218,6 +231,48 @@
]}
/>
</Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.safeQty"
+ source="safeQty"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.minQty"
+ source="minQty"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.maxQty"
+ source="maxQty"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.stagn"
+ source="stagn"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.valid"
+ source="valid"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.validWarn"
+ source="validWarn"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.flagCheck"
+ source="flagCheck"
+ />
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
--
Gitblit v1.9.1