zhang
9 天以前 5a10e832b6b63a10ff7479789577a4100a440d5b
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusRtuOverTcp;
import com.ghgande.j2mod.modbus.facade.ModbusTCPMaster;
import com.zy.acs.charge.ChargeCoreService;
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.enums.AgvStatusType;
@@ -348,10 +348,10 @@
        // 手动充电模式,跳过
        if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
            FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
            ModbusRtuOverTcp modbusTcp = chargeService.get(funcSta.getUuid());
            ModbusTCPMaster modbusTCPMaster = chargeService.get(funcSta.getUuid());
            // 手动充电模式,跳过
            if (chargeCoreService.getChargeMode(modbusTcp) != 1) {
                return  false;
            if (chargeCoreService.getChargeMode(modbusTCPMaster) != 1) {
                return false;
            }
        }
        return true;