Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

skyouc

2025-02-18 ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a

 rsf-admin/src/page/matnr/MatnrEdit.jsx

@@ -64,6 +64,21 @@
                            {translate('common.edit.title.main')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                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}>
                            <ReferenceInput
                                source="shipperId"
                                reference="shipper"
@@ -77,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"
@@ -98,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 })}
                                />
@@ -146,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>
@@ -201,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}>