From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/page/matnr/MatnrEdit.jsx | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrEdit.jsx b/rsf-admin/src/page/matnr/MatnrEdit.jsx
index 12a61f2..086aa72 100644
--- a/rsf-admin/src/page/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/matnr/MatnrEdit.jsx
@@ -65,10 +65,17 @@
</Typography>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.matnr.uuid"
- source="uuid"
+ label="table.field.matnr.name"
+ source="name"
parse={v => v}
autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.matnr.code"
+ source="code"
+ parse={v => v}
/>
</Stack>
<Stack direction='row' gap={2}>
@@ -85,20 +92,6 @@
</ReferenceInput>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
- label="table.field.matnr.name"
- source="name"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.matnr.code"
- source="code"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
<ReferenceInput
source="groupId"
reference="matnrGroup"
@@ -106,6 +99,19 @@
>
<AutocompleteInput
label="table.field.matnr.groupId"
+ optionText="code"
+ filterToQuery={(val) => ({ code: val })}
+ />
+ </ReferenceInput>
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <ReferenceInput
+ source="batchRegularId"
+ reference="batchRegular"
+ perPage={REFERENCE_INPUT_PAGESIZE}
+ >
+ <AutocompleteInput
+ label="table.field.matnr.batchRegularId"
optionText="code"
filterToQuery={(val) => ({ code: val })}
/>
@@ -154,8 +160,8 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.matnr.desc"
- source="desc"
+ label="table.field.matnr.describle"
+ source="describle"
parse={v => v}
/>
</Stack>
@@ -209,6 +215,48 @@
validate={required()}
/>
</Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.safetyQty"
+ source="safetyQty"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.minQty"
+ source="minQty"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.maxQty"
+ source="maxQty"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.stagnate"
+ source="stagnate"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.validity"
+ source="validity"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.validityWarr"
+ source="validityWarr"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.matnr.flagCheck"
+ source="flagCheck"
+ />
+ </Stack>
</Grid>
<Grid item xs={12} md={4}>
--
Gitblit v1.9.1