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

skyouc

2025-03-26 1f5173508a63509985b27d94660f6ad251d18e6e

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

@@ -100,7 +100,7 @@
            redirect="list"
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            aside={<EditBaseAside />}
            title={"menu.matnr"}
        >
            <SimpleForm
                shouldUnregister
@@ -144,7 +144,6 @@
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
                                        <AutocompleteInput
                                            validate={[required()]}
                                            label="table.field.matnr.shipperId"
                                            optionText="name"
                                            filterToQuery={(val) => ({ name: val })}
@@ -270,6 +269,7 @@
                                            <TextInput
                                                label={item.fieldsAlise}
                                                source={item.fields}
                                                validate={required()}
                                            />
                                        </Grid>
                                    )
@@ -318,6 +318,16 @@
                                        source="valid"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.matnr.flagCheck"
                                        source="flagCheck"
                                        choices={[
                                            { id: 0, name: ' 否' },
                                            { id: 1, name: ' 是' },
                                        ]}
                                    />
                                </Grid>
                            </Grid>
                        </CustomTabPanel>
                        <CustomTabPanel value={value} index={2}>