#

luxiaotao1123

2024-03-14 f786be09c7ed79c8887ec413ac19e1caa08a16e7

#

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

@@ -34,6 +34,7 @@
    'map.settings.config.param': 'Config Parameters',
    '': '',
    '': '',
    'map.settings.no': 'No.',
    'map.settings.shelf.no': 'Shelf No',
    'map.settings.shelf.row': 'Row',
    'map.settings.shelf.bay': 'Bay',

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

@@ -81,6 +81,7 @@
                        curSprite.data.bay = values.bay;
                        break;
                    case Utils.SENSOR_TYPE.AGV:
                        curSprite.data.no = values.no; // *
                        break;
                    default:
                        break;
@@ -125,7 +126,7 @@
                    <span>{curSprite?.data?.type}</span>
                </Form.Item>
                <Form.Item
                    label={intl.formatMessage({ id: 'map.settings.uuid', defaultMessage: '编号' })}
                    label={intl.formatMessage({ id: 'map.settings.uuid', defaultMessage: '地图号' })}
                >
                    <span>{curSprite?.data?.uuid}</span>
                </Form.Item>
@@ -168,25 +169,26 @@
                                }}
                            />
                        </Form.Item>
                        <Form.Item
                            name='no'
                            label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '货架号' })}
                            rules={[
                                {
                                    required: false,
                                },
                            ]}
                        >
                            <Input
                                style={{
                                    width: '50%',
                                }}
                            />
                        </Form.Item>
                    </>
                )}

                <Form.Item
                    name='no'
                    label={intl.formatMessage({ id: 'map.settings.no', defaultMessage: '编号' })}
                    rules={[
                        {
                            required: false,
                        },
                    ]}
                >
                    <Input
                        style={{
                            width: '50%',
                        }}
                    />
                </Form.Item>

                <Form.Item
                    wrapperCol={{
                        offset: 4,
                        span: 16,

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

@@ -54,6 +54,12 @@
    }

    const handleFinish = (values) => {
        console.log({
            ...values
            , ...props.values
            , autoIncrement: autoIncrement
            , type: curSprite?.data?.type
        });
        props.submit({
            ...values
            , ...props.values
@@ -88,7 +94,6 @@
                    initialValues={{
                        copyGap: 0,
                        autoIncrement: false,
                        incrementValue: 'row',
                        incrementMode: 'ascending',
                    }}
                    onFinish={handleFinish}
@@ -153,15 +158,44 @@
                            <>
                                <Col span={24}>
                                    <Form.Item
                                        name='id'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.id', defaultMessage: '序号' })}
                                        name='incrementValue'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '自增长值' })}
                                        labelCol={{ span: 8 }}
                                        initialValue='no'
                                    >
                                        <Segmented
                                            block
                                            options={[
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.no', defaultMessage: '编号' }),
                                                    value: 'no'
                                                },
                                            ]}
                                            onChange={(value) => {
                                            }}
                                        />
                                    </Form.Item>
                                </Col>
                                <Col span={24}>
                                    <Form.Item
                                        name='incrementMode'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '增长方式' })}
                                        labelCol={{ span: 8 }}
                                    >
                                        <InputNumber
                                            style={{
                                                width: '60%',
                                        <Segmented
                                            block
                                            options={[
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '升序' }),
                                                    value: 'ascending'
                                                },
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '降序' }),
                                                    value: 'descending'
                                                },
                                            ]}
                                            onChange={(value) => {
                                            }}
                                            min={0}
                                        />
                                    </Form.Item>
                                </Col>
@@ -175,6 +209,7 @@
                                        name='incrementValue'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '自增长值' })}
                                        labelCol={{ span: 8 }}
                                        initialValue='row'
                                    >
                                        <Segmented
                                            block

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

@@ -122,6 +122,15 @@
                        }
                        break;
                    case Utils.SENSOR_TYPE.AGV:
                       
                        if (values.incrementValue === 'no') {
                            console.log(curSprite.data.no);
                            if (values.incrementMode === 'descending') {
                                copiedSprite.data.no = Number(curSprite.data.no) - i - 1;
                            } else {
                                copiedSprite.data.no = Number(curSprite.data.no) + i + 1;
                            }
                        }
                        break;
                    default:
                        break;