#

luxiaotao1123

2024-04-28 0b3ff4b806168d3a1959b19bdf331a86367c0883

#

 zy-asrs-flow/src/locales/en-US/map.ts

@@ -8,6 +8,8 @@
    'map.save': 'Save Map',
    'map.load': 'Load Map',
    'map.clear': 'Clear Map',
    'map.x': 'x',
    'map.y': 'y',
    'map.load.success': 'Welcome To WCS.',
    '': '',
    '': '',
@@ -132,6 +134,7 @@
    'map.settings.shelf.lift': 'Lift',
    'map.settings.shelf.charge': 'Charge',
    'map.settings.shelf.diable': 'Diable',
    'map.settings.shelf.reference': 'Reference',
    '': '',
    '': '',
    '': '',

 zy-asrs-flow/src/pages/User/Login/index.jsx

@@ -90,15 +90,17 @@
    useEffect(() => {
        const fetchHostList = async () => {
            const resp = await Http.doGet('api/auth/host');
            const list = resp.data.map(item => ({
                label: item.name,
                value: item.id
            }));
            setHostList(list);
            if (list && list.length > 0) {
                form.setFieldsValue({
                    hostId: list[0].value
                });
            if (resp?.data) {
                const list = resp.data.map(item => ({
                    label: item.name,
                    value: item.id
                }));
                setHostList(list);
                if (list && list.length > 0) {
                    form.setFieldsValue({
                        hostId: list[0].value
                    });
                }
            }
        }
        fetchHostList();

 zy-asrs-flow/src/pages/map/components/configSettings.jsx

@@ -313,6 +313,44 @@
                            </Space.Compact>
                        </Form.Item>
                        <Form.Item
                            label={intl.formatMessage({ id: 'map.settings.shelf.reference', defaultMessage: '基准值' })}
                        >
                            <Space.Compact>
                                <Form.Item
                                    name='refx'
                                    noStyle
                                    rules={[
                                        {
                                            required: false,
                                        },
                                    ]}
                                >
                                    <InputNumber
                                        addonBefore={<Space.Compact><FormattedMessage id='map.x' defaultMessage='x' /></Space.Compact>}
                                        style={{
                                            width: '50%',
                                        }}
                                    />
                                </Form.Item>
                                <Form.Item
                                    name='refy'
                                    noStyle
                                    rules={[
                                        {
                                            required: false,
                                        },
                                    ]}
                                >
                                    <InputNumber
                                        addonBefore={<Space.Compact><FormattedMessage id='map.y' defaultMessage='y' /></Space.Compact>}
                                        style={{
                                            width: '50%',
                                        }}
                                    />
                                </Form.Item>
                            </Space.Compact>
                        </Form.Item>
                        <Form.Item
                            name='value'
                            label={intl.formatMessage({ id: 'map.settings.shelf.value', defaultMessage: '地图值' })}
                        >

 zy-asrs-flow/src/pages/map/components/mapSettings.jsx

@@ -131,6 +131,25 @@
                                copiedSprite.data.bay = curSprite.data.bay + i + 1;
                            }
                        }
                        // reference value
                        if (copiedSprite.data.refx && copiedSprite.data.refy) {
                            switch (values.copyDire) {
                                case 'left':
                                    copiedSprite.data.refx -= curSprite.data.left * (i + 1);
                                    break;
                                case 'right':
                                    copiedSprite.data.refx += curSprite.data.right * (i + 1);
                                    break;
                                case 'top':
                                    copiedSprite.data.refy -= curSprite.data.top * (i + 1);
                                    break;
                                case 'bottom':
                                    copiedSprite.data.refy += curSprite.data.bottom * (i + 1);
                                    break;
                                default:
                                    break;
                            }
                        }
                        if (copiedSprite.data.row && copiedSprite.data.bay) {
                            copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
                        }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java

@@ -35,6 +35,7 @@
            "/api/auth/host",
            "/test/**",
            "/api/login",
            "/api/auth/host",
            "/druid/**",
            "/swagger-ui.html",
            "/swagger-resources/**",