zhang
2025-12-26 9569af2a6abcccc3f312abff0a7e660c0f2be2c8
电压改电量
6个文件已修改
14 ■■■■ 已修改文件
zy-acs-flow/src/map/insight/agv/AgvMain.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -178,7 +178,7 @@
                                <KeyValuePair label={translate('common.field.status')} value={info?.agvStatus} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.agvDetail.vol')} value={info?.vol} />
                                <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
                            </Grid>
                            {/* <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
@@ -155,7 +155,7 @@
            agvDetail.setCode(code.getId());
            agvDetail.setStatus(AgvStatusType.IDLE.val);
            agvDetail.setAgvAngle(workDirection);
            agvDetail.setVol(5000);
            agvDetail.setSoc(80);
            agvDetailService.updateById(agvDetail);
        }
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -54,7 +54,7 @@
        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
            if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus()) {
            if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus()) {
                continue;
            }
            if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -206,7 +206,7 @@
            log.warn("[{}]号Agv未收到状态包......", agvNo);
            return false;
        }
        if (agvDetail.getVol() == 0) {
        if (null == agvDetail.getSoc() || agvDetail.getSoc() == 0) {
            return false;
        }
        if (!agvDetail.getAgvStatus().equals(AgvStatusType.IDLE) && !agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -214,7 +214,7 @@
            return false;
        }
        if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
            if (agvDetail.getVol() < agvModel.getQuaBattery()) {
            if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
                return false;
            }
        }
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -94,7 +94,7 @@
                    AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
                    AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
                    if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                        if (agvDetail.getVol() < agvModel.getQuaBattery()) {
                        if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
                            return false;
                        }
                    } else {
zy-acs-manager/src/main/resources/mapper/manager/AgvDetailMapper.xml
@@ -27,7 +27,7 @@
    </sql>
    <select id="selectMajorByAgvId" resultType="com.zy.acs.manager.manager.entity.AgvDetail">
        SELECT id, agv_id, pos, code, last_code, agv_angle, vol, backpack, status, deleted
        SELECT id, agv_id, pos, code, last_code, agv_angle, vol,soc, backpack, status, deleted
        FROM man_agv_detail
        WHERE agv_id = #{agvId}
        LIMIT 1