#

vincentlu

2026-01-26 5f6a52bb812a322c22ccefaf00cadde7bcb125d5

#

 version/db/new.sql

@@ -12,3 +12,12 @@

CREATE INDEX idx_agv_state_wait
    ON man_travel (agv_id, state, roller_waiting, deleted);




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

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

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

@@ -287,6 +287,8 @@
                staType: "station type",
                code: "code",
                offset: "offset",
                hight: "hight",
                depth: "depth",
                angle: 'angle',
                autoing: "autoing",
                loading: "loading",

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

@@ -287,6 +287,8 @@
                staType: "站点类型",
                code: "地面码",
                offset: "偏移量",
                hight: "作业高度",
                depth: "作业深度",
                angle: '作业角度',
                autoing: "自动",
                loading: "载货",

 zy-acs-flow/src/page/sta/StaCreate.jsx

@@ -153,12 +153,26 @@
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.offset"
                                        source="offset"
                                        validate={required()}
                                    />
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.hight"
                                        source="hight"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.depth"
                                        source="depth"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput

 zy-acs-flow/src/page/sta/StaEdit.jsx

@@ -130,17 +130,29 @@
                                validate={required()}
                            />
                            <NumberInput
                                label="table.field.sta.offset"
                                source="offset"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.sta.angle"
                                source="angle"
                                validate={required()}
                            />
                            {/* <NumberInput
                                label="table.field.sta.offset"
                                source="offset"
                                validate={required()}
                            /> */}
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.sta.hight"
                                source="hight"
                                validate={required()}
                            />
                            <NumberInput
                                label="table.field.sta.depth"
                                source="depth"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            {/* <NumberInput
                                label="table.field.sta.occCnt"
                                source="occCnt"
@@ -152,14 +164,14 @@
                            <NumberInput
                                label="table.field.sta.rsvInCnt"
                                source="rsvInCnt"
                                // InputProps={{ readOnly: true }}
                                // disabled
                            // InputProps={{ readOnly: true }}
                            // disabled
                            />
                            <NumberInput
                                label="table.field.sta.rsvOutCnt"
                                source="rsvOutCnt"
                                // InputProps={{ readOnly: true }}
                                // disabled
                            // InputProps={{ readOnly: true }}
                            // disabled
                            />
                        </Stack>
                    </Grid>

 zy-acs-flow/src/page/sta/StaList.jsx

@@ -134,7 +134,7 @@
                    expand={() => <StaPanel />}
                    expandSingle={true}
                    rowSx={rowSx(drawerVal || null)}
                    omit={['id', 'uuid', 'name', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'uuid', 'name', 'offset', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
@@ -157,6 +157,8 @@
                    <NumberField source="rsvInCnt" label="table.field.sta.rsvInCnt" />
                    <NumberField source="rsvOutCnt" label="table.field.sta.rsvOutCnt" />
                    <NumberField source="offset" label="table.field.sta.offset" />
                    <NumberField source="hight" label="table.field.sta.hight" />
                    <NumberField source="depth" label="table.field.sta.depth" />
                    <NumberField source="angle" label="table.field.sta.angle" />
                    {/* <TextField source="autoing" label="table.field.sta.autoing" />
                    <TextField source="loading" label="table.field.sta.loading" />

 zy-acs-flow/src/page/sta/StaPanel.jsx

@@ -41,7 +41,9 @@
    { labelKey: 'table.field.sta.capacity', valueKey: 'capacity' },
    { labelKey: 'table.field.sta.rsvInCnt', valueKey: 'rsvInCnt' },
    { labelKey: 'table.field.sta.rsvOutCnt', valueKey: 'rsvOutCnt' },
    { labelKey: 'table.field.sta.offset', valueKey: 'offset' },
    // { labelKey: 'table.field.sta.offset', valueKey: 'offset' },
    { labelKey: 'table.field.sta.height', valueKey: 'height' },
    { labelKey: 'table.field.sta.depth', valueKey: 'depth' },
    { labelKey: 'table.field.sta.zpallet', valueKey: 'zpallet' },
];


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

@@ -55,6 +55,12 @@
    @ApiModelProperty(value= "偏移量")
    private Double offset;

    @ApiModelProperty(value= "作业高度")
    private Double height;

    @ApiModelProperty(value= "作业深度")
    private Double depth;

    @ApiModelProperty(value= "作业角度")
    private String angle;