#

vincentlu

5 天以前 f6d1bccd9148413612801d4ff6ac5d629564a642

#

 version/db/new.sql

@@ -14,8 +14,6 @@
    ON man_travel (agv_id, state, roller_waiting, deleted);




alter table man_sta
    add height decimal(24, 9) null comment '作业高度' after offset;

@@ -91,3 +89,9 @@
)
    charset = utf8;


alter table man_agv_model
    add head_offset int(11) null comment '车头(毫米)' after length;

alter table man_agv_model
    add tail_offset int(11) null comment '车尾(毫米)' after head_offset;

 zy-acs-flow/src/i18n/en.js

@@ -366,6 +366,8 @@
                type: "model type",
                name: "model name",
                length: "length",
                headOffset: "head (mm)",
                tailOffset: "tail (mm)",
                width: "width",
                height: "height",
                liftHeight: "lift height",

 zy-acs-flow/src/i18n/zh.js

@@ -366,6 +366,8 @@
                type: "车类型",
                name: "车型名",
                length: "长度",
                headOffset: "车头(毫米)",
                tailOffset: "车尾(毫米)",
                width: "宽度",
                height: "高度",
                liftHeight: "举升高度",

 zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx

@@ -205,6 +205,14 @@
                <DetailValue value={record.agvModelData.length} />
            </Grid>
            <Grid item xs={ITEM_COL}>
                <DetailTitle title='table.field.agvModel.headOffset' />
                <DetailValue value={record.agvModelData.headOffset} />
            </Grid>
            <Grid item xs={ITEM_COL}>
                <DetailTitle title='table.field.agvModel.tailOffset' />
                <DetailValue value={record.agvModelData.tailOffset} />
            </Grid>
            <Grid item xs={ITEM_COL}>
                <DetailTitle title='table.field.agvModel.width' />
                <DetailValue value={record.agvModelData.width} />
            </Grid>
@@ -254,4 +262,4 @@
            </Grid>
        </Grid>
    )
}
}

 zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx

@@ -116,6 +116,20 @@
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.headOffset"
                                        source="headOffset"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.tailOffset"
                                        source="tailOffset"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.width"
                                        source="width"
                                    />

 zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx

@@ -89,6 +89,18 @@
                                source="length"
                            />
                            <NumberInput
                                label="table.field.agvModel.headOffset"
                                source="headOffset"
                                validate={required()}
                            />
                            <NumberInput
                                label="table.field.agvModel.tailOffset"
                                source="tailOffset"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.agvModel.width"
                                source="width"
                            />

 zy-acs-flow/src/page/agvModel/AgvModelList.jsx

@@ -66,6 +66,8 @@
    <TextInput source="type" label="table.field.agvModel.type" />,
    <TextInput source="name" label="table.field.agvModel.name" />,
    <NumberInput source="length" label="table.field.agvModel.length" />,
    <NumberInput source="headOffset" label="table.field.agvModel.headOffset" />,
    <NumberInput source="tailOffset" label="table.field.agvModel.tailOffset" />,
    <NumberInput source="width" label="table.field.agvModel.width" />,
    <NumberInput source="height" label="table.field.agvModel.height" />,
    <NumberInput source="liftHeight" label="table.field.agvModel.liftHeight" />,
@@ -135,7 +137,8 @@
                    expand={() => <AgvModelPanel />}
                    expandSingle={true}
                    omit={['id', 'uuid', 'liftHeight', 'mqttTopic', 'password', 'protocol'
                        , 'length', 'width', 'height', 'allDirectionBool'
                        // , 'headOffset', 'tailOffset'
                        , 'length', 'width', 'height', 'allDirectionBool', 'diameter'
                        , 'statusBool', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
@@ -143,6 +146,8 @@
                    <TextField source="name" label="table.field.agvModel.name" />
                    <TextField source="type" label="table.field.agvModel.type" />
                    <NumberField source="length" label="table.field.agvModel.length" />
                    <NumberField source="headOffset" label="table.field.agvModel.headOffset" />
                    <NumberField source="tailOffset" label="table.field.agvModel.tailOffset" />
                    <NumberField source="width" label="table.field.agvModel.width" />
                    <NumberField source="height" label="table.field.agvModel.height" />
                    <NumberField source="liftHeight" label="table.field.agvModel.liftHeight" />

 zy-acs-flow/src/page/agvModel/AgvModelPanel.jsx

@@ -66,6 +66,18 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.agvModel.headOffset"
                                property={record.headOffset}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.agvModel.tailOffset"
                                property={record.tailOffset}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.agvModel.width"
                                property={record.width}
                            />

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java

@@ -47,6 +47,18 @@
    private Integer length;

    /**
     * 车头(毫米)
     */
    @ApiModelProperty(value= "车头(毫米)")
    private Integer headOffset;

    /**
     * 车尾(毫米)
     */
    @ApiModelProperty(value= "车尾(毫米)")
    private Integer tailOffset;

    /**
     * 宽度
     */
    @ApiModelProperty(value= "宽度")