#

vincentlu

2025-12-26 b73d4c5f5995bdb38fab1cdfdf413e759db261f2

#

 version/db/sqlIndex

@@ -34,3 +34,8 @@
# sys_config
CREATE INDEX idx_config_flag ON sys_config(flag);
CREATE INDEX idx_config_deleted_flag ON sys_config(deleted, flag);
# man_sta_reserve
CREATE INDEX idx_sta_state      ON man_sta_reserve (sta_id, state);
CREATE INDEX idx_task           ON man_sta_reserve (task_id);
CREATE INDEX idx_agv           ON man_sta_reserve (agv_id);
CREATE INDEX idx_sta_type_state ON man_sta_reserve (sta_id, reserve_type, state);

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

@@ -286,6 +286,10 @@
                outEnable: "out enable",
                zpallet: "zpallet",
                staSts: "station status",
                capacity: "capacity",
                occCnt: 'occupancy qty',
                rsvInCnt: 'reserve release qty',
                rsvOutCnt: 'reserved pickup qty',
            },
            codeGap: {
                code0: "code 1",

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

@@ -286,6 +286,10 @@
                outEnable: "可出",
                zpallet: "料箱码",
                staSts: "站点状态",
                capacity: "槽位数",
                occCnt: '占用数',
                rsvInCnt: '预约放货量',
                rsvOutCnt: '预约取货量',
            },
            codeGap: {
                code0: "code 1",

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

@@ -120,7 +120,7 @@
                                        parse={v => v}
                                    />
                                </Grid> */}
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="staType"
                                        reference="staType"
@@ -132,7 +132,7 @@
                                            validate={required()}
                                        />
                                    </ReferenceInput>
                                </Grid> */}
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="code"
@@ -148,6 +148,13 @@
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.capacity"
                                        source="capacity"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.offset"
                                        source="offset"
                                        validate={required()}

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

@@ -120,27 +120,30 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.sta.autoing"
                                source="autoing"
                                parse={v => v}
                            <NumberInput
                                label="table.field.sta.capacity"
                                source="capacity"
                                validate={required()}
                            />
                            <TextInput
                                label="table.field.sta.loading"
                                source="loading"
                                parse={v => v}
                            <NumberInput
                                label="table.field.sta.occCnt"
                                source="occCnt"
                                InputProps={{ readOnly: true }}
                                disabled
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.sta.inEnable"
                                source="inEnable"
                                parse={v => v}
                            <NumberInput
                                label="table.field.sta.rsvInCnt"
                                source="rsvInCnt"
                                InputProps={{ readOnly: true }}
                                disabled
                            />
                            <TextInput
                                label="table.field.sta.outEnable"
                                source="outEnable"
                                parse={v => v}
                            <NumberInput
                                label="table.field.sta.rsvOutCnt"
                                source="rsvOutCnt"
                                InputProps={{ readOnly: true }}
                                disabled
                            />
                        </Stack>
                    </Grid>

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

@@ -147,11 +147,15 @@
                        <TextField source="name" />
                    </ReferenceField>
                    <TextField source="name" label="table.field.sta.name" />
                    <NumberField source="capacity" label="table.field.sta.capacity" />
                    <NumberField source="occCnt" label="table.field.sta.occCnt" />
                    <NumberField source="rsvInCnt" label="table.field.sta.rsvInCnt" />
                    <NumberField source="rsvOutCnt" label="table.field.sta.rsvOutCnt" />
                    <NumberField source="offset" label="table.field.sta.offset" />
                    <TextField source="autoing" label="table.field.sta.autoing" />
                    {/* <TextField source="autoing" label="table.field.sta.autoing" />
                    <TextField source="loading" label="table.field.sta.loading" />
                    <TextField source="inEnable" label="table.field.sta.inEnable" />
                    <TextField source="outEnable" label="table.field.sta.outEnable" />
                    <TextField source="outEnable" label="table.field.sta.outEnable" /> */}
                    <TextField source="zpallet" label="table.field.sta.zpallet" />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java

@@ -1,6 +1,5 @@
package com.zy.acs.manager.core.service;

import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Sta;
@@ -13,6 +12,19 @@
import java.util.Date;

// man_segment: start_time, end_time
/**
 * alter table man_sta
 *     add capacity int null comment '槽位数' after angle;
 *
 * alter table man_sta
 *     add occ_cnt int null comment '占用数' after capacity;
 *
 * alter table man_sta
 *     add rsv_in_cnt int null comment '预约放货量' after occ_cnt;
 *
 * alter table man_sta
 *     add rsv_out_cnt int null comment '预约取货量' after rsv_in_cnt;
 */
@Slf4j
@Service
public class TransferStationHandler {

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

@@ -21,142 +21,85 @@

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 编号
     */
    @ApiModelProperty(value= "编号")
    private String uuid;

    /**
     * 库区
     */
    @ApiModelProperty(value= "库区")
    private Long zoneId;

    /**
     * 站号
     */
    @ApiModelProperty(value= "站号")
    private String staNo;

    /**
     * 名称
     */
    @ApiModelProperty(value= "名称")
    private String name;

    /**
     * 站类型
     */
    @ApiModelProperty(value= "站类型")
    private Long staType;

    /**
     * 条码
     */
    @ApiModelProperty(value= "条码")
    private Long code;

    /**
     * 偏移量
     */
    @ApiModelProperty(value= "槽位数")
    private Integer capacity;

    @ApiModelProperty(value= "占用数")
    private Integer occCnt;

    @ApiModelProperty(value= "预约放货量")
    private Integer rsvInCnt;

    @ApiModelProperty(value= "预约取货量")
    private Integer rsvOutCnt;

    @ApiModelProperty(value= "偏移量")
    private Double offset;

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

    /**
     * 自动
     */
    @ApiModelProperty(value= "自动")
    private String autoing;

    /**
     * 有物
     */
    @ApiModelProperty(value= "有物")
    private String loading;

    /**
     * 可入
     */
    @ApiModelProperty(value= "可入")
    private String inEnable;

    /**
     * 可出
     */
    @ApiModelProperty(value= "可出")
    private String outEnable;

    /**
     * 托盘码
     */
    @ApiModelProperty(value= "托盘码")
    private String zpallet;

    /**
     * 站状态
     */
    @ApiModelProperty(value= "站状态")
    private Long staSts;

    /**
     * 状态 1: 正常  0: 冻结  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    private Integer deleted;

    /**
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Long tenantId;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    private Date createTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    private Date updateTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

@@ -194,18 +137,6 @@
            return String.valueOf(staSts.getName());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "冻结";
            default:
                return String.valueOf(this.status);
        }
    }

    public Boolean getStatusBool(){