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

skyouc

2025-03-21 67e6956e76106cdb7245bd1055f65b1f0e7c68e5

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

 rsf-admin/index.html

@@ -9,7 +9,7 @@
        <meta name="theme-color" content="#000000" />
        <link rel="manifest" href="./manifest.json" />
        <link rel="shortcut icon" href="./favicon.ico" />
        <title>rsf - vincent</title>
        <title>智能仓储WMS管理系统</title>
        <style>
            body {
                margin: 0;

 rsf-admin/public/favicon.ico

 rsf-admin/src/page/basicInfo/loc/InitModal.jsx

@@ -63,6 +63,7 @@
    const notify = useNotify();

    const [formData, setFormData] = useState({
        "warehouseId": null,
        "areaId": undefined,
        "endBay": undefined,
        "endLev": undefined,
@@ -113,8 +114,26 @@
                        <Grid container spacing={2}>
                            <Grid item xs={4}>
                                <ReferenceInput
                                    source="warehouseId"
                                    reference="warehouse"
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.warehouseId"
                                        optionText="name"
                                        onChange={(value) => handleChange(value, 'warehouseId')}
                                        value={formData.warehouseId}
                                        validate={[required()]}
                                        filterToQuery={(val) => ({ name: val })}
                                    />
                                </ReferenceInput>

                            </Grid>

                            <Grid item xs={4}>
                                <ReferenceInput
                                    source="areaId"
                                    reference="warehouseAreas"
                                    filter={{ warehouseId: formData.warehouseId }}
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.areaId"
@@ -128,16 +147,6 @@

                            </Grid>

                            <Grid item xs={4}>
                                <DictionarySelect
                                    label={translate("table.field.loc.locType")}
                                    name="locType"
                                    value={formData.locType}
                                    onChange={(e) => handleChange(e.target.value, 'locType')}
                                    size="small"
                                    dictTypeCode="sys_width_type"
                                />
                            </Grid>

                            <Grid item xs={4}>
                                <ReferenceArrayInput source="typeIds" reference="locType" >

 rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx

@@ -122,7 +122,7 @@
                    <NumberField source="id" />
                    <TextField source="name" label="table.field.locArea.name" />
                    <TextField source="code" label="table.field.locArea.code" />
                    <NumberField source="areaId" label="table.field.locArea.areaId" />
                    <NumberField source="areaId$" label="table.field.locArea.areaId" />
                    {/* <ReferenceField source="locId" label="table.field.locArea.locId" reference="loc" link={false} sortable={false}>
                        <TextField source="warehouseId" />
                    </ReferenceField> */}

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

@@ -98,7 +98,7 @@
                </FormControl>

                <Box>
                    <div ref={contentRef}>
                    <div ref={contentRef} style={{ display: 'flex', justifyContent: 'center' }}>
                        <table
                            className="contain"
                            style={{

 rsf-admin/src/page/login/index.jsx

@@ -56,7 +56,7 @@
                backgroundSize: 'cover',
            }}
        >
            <video
            {/* <video
                autoPlay
                loop
                muted
@@ -76,7 +76,7 @@
                {LOGIN_BACKGROUND === 'media' && (
                    <source src="/login_bg.mp4" type="video/mp4" />
                )}
            </video>
            </video> */}

            <Card sx={{
                width: 400,