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

skyouc

2025-05-20 843d5b6dd50567dadcc56257f074840e80d757aa

 rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx

@@ -49,6 +49,7 @@
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            aside={<EditBaseAside />}
            title={"menu.warehouse"}
        >
            <SimpleForm
                shouldUnregister
@@ -65,6 +66,14 @@
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.warehouse.factory"
                                source="factory"
                                validate={[required()]}
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.warehouse.name"
                                source="name"
                                validate={[required()]}
@@ -76,17 +85,11 @@
                            <TextInput
                                label="table.field.warehouse.code"
                                source="code"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.warehouse.factory"
                                source="factory"
                                validate={[required()]}
                                parse={v => v}
                            />
                        </Stack>

                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.warehouse.address"
@@ -101,8 +104,6 @@
                                source="longitude"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.warehouse.latgitude"
                                source="latgitude"
@@ -110,24 +111,22 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>

                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.warehouse.length"
                                source="length"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.warehouse.width"
                                source="width"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.warehouse.height"
                                source="height"
                            />
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
@@ -135,7 +134,15 @@
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                        <TextInput
                            label="common.field.memo"
                            source="memo"
                            parse={v => v}
                            fullWidth
                            multiline
                            minRows={2}
                            autoFocus
                        />
                    </Grid>
                </Grid>
            </SimpleForm>