zhang
7 天以前 e5950739d6df283c02fe3160b8b8f739a902f415
充电机代码提交
1个文件已修改
16 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -346,14 +346,14 @@
            return true;
        }
        // 手动充电模式,跳过
        if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
            FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
            ModbusTCPMaster modbusTCPMaster = chargeService.get(funcSta.getUuid());
            // 手动充电模式,跳过
            if (chargeCoreService.getChargeMode(modbusTCPMaster) == 1) {
                return true;
            }
        }
//        if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
//            FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
//            ModbusTCPMaster modbusTCPMaster = chargeService.get(funcSta.getUuid());
//            // 手动充电模式,跳过
//            if (modbusTCPMaster != null && chargeCoreService.getChargeMode(modbusTCPMaster) == 1) {
//                return true;
//            }
//        }
        return false;
    }