#
vincentlu
2026-01-27 dccd8442c8015ae48453168aceacff64ad28f994
#
7个文件已修改
47 ■■■■ 已修改文件
zy-acs-flow/src/i18n/en.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/sta/StaCreate.jsx 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/sta/StaEdit.jsx 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/sta/StaList.jsx 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/sta/StaPanel.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/en.js
@@ -290,6 +290,8 @@
                height: "height",
                depth: "depth",
                angle: 'angle',
                inboundWait: 'inbound wait(ms)',
                outboundWait: 'outbound wait(ms)',
                autoing: "autoing",
                loading: "loading",
                inEnable: "in enable",
zy-acs-flow/src/i18n/zh.js
@@ -290,6 +290,8 @@
                height: "作业高度",
                depth: "作业深度",
                angle: '作业角度',
                inboundWait: '入库等待(毫秒)',
                outboundWait: '出库等待(毫秒)',
                autoing: "自动",
                loading: "载货",
                inEnable: "可入",
zy-acs-flow/src/page/sta/StaCreate.jsx
@@ -162,8 +162,8 @@
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.hight"
                                        source="hight"
                                        label="table.field.sta.height"
                                        source="height"
                                        validate={required()}
                                    />
                                </Grid>
@@ -179,6 +179,18 @@
                                        label="table.field.sta.angle"
                                        source="angle"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.inboundWait"
                                        source="inboundWait"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.outboundWait"
                                        source="outboundWait"
                                    />
                                </Grid>
                                {/* <Grid item xs={6} display="flex" gap={1}>
@@ -230,9 +242,9 @@
                                    </ReferenceInput>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={12} display="flex" gap={1}>
                                    <Stack direction="column" spacing={1} width={'100%'}>
                                        <MemoInput />
zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -142,8 +142,8 @@
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.sta.hight"
                                source="hight"
                                label="table.field.sta.height"
                                source="height"
                                validate={required()}
                            />
                            <NumberInput
@@ -153,6 +153,16 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.sta.inboundWait"
                                source="inboundWait"
                            />
                            <NumberInput
                                label="table.field.sta.outboundWait"
                                source="outboundWait"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            {/* <NumberInput
                                label="table.field.sta.occCnt"
                                source="occCnt"
zy-acs-flow/src/page/sta/StaList.jsx
@@ -134,7 +134,8 @@
                    expand={() => <StaPanel />}
                    expandSingle={true}
                    rowSx={rowSx(drawerVal || null)}
                    omit={['id', 'uuid', 'name', 'offset', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'uuid', 'name', 'offset', 'zpallet'
                        , 'updateTime', 'updateBy', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
@@ -160,6 +161,8 @@
                    <NumberField source="hight" label="table.field.sta.height" />
                    <NumberField source="depth" label="table.field.sta.depth" />
                    <NumberField source="angle" label="table.field.sta.angle" />
                    <NumberField source="inboundWait" label="table.field.sta.inboundWait" />
                    <NumberField source="outboundWait" label="table.field.sta.outboundWait" />
                    {/* <TextField source="autoing" label="table.field.sta.autoing" />
                    <TextField source="loading" label="table.field.sta.loading" />
                    <TextField source="inEnable" label="table.field.sta.inEnable" />
zy-acs-flow/src/page/sta/StaPanel.jsx
@@ -44,6 +44,8 @@
    // { 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.inboundWait', valueKey: 'inboundWait' },
    { labelKey: 'table.field.sta.outboundWait', valueKey: 'outboundWait' },
    { labelKey: 'table.field.sta.zpallet', valueKey: 'zpallet' },
];
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java
@@ -12,6 +12,7 @@
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.StaReserveService;
import com.zy.acs.manager.manager.service.StaService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -72,6 +73,7 @@
        sta.setCreateTime(now);
        sta.setUpdateBy(loginUserId);
        sta.setUpdateTime(now);
        sta.setStatus(StatusType.ENABLE.val);
        if (!staService.save(sta)) {
            return R.error("Save Fail");
        }