充电机代码提交

zhang

7 天以前 edfe933a8acdaea32c54b0b55eb3e68c39623ba5

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java

@@ -328,21 +328,21 @@
                        }
                    }
                    break;
                case 3:
                    // 手动断开充电
                    // 前进信号存在，说明机械臂未伸回
                    if (chargeCoreService.checkForwardRelayOnline(modbusTCPMaster)) {
                        log.info("发送充电机手动断充指令：车号：{}", agvDetail.getAgvId$());
                        chargeCoreService.stopCharging(modbusTCPMaster);
                        continue;
                    }
                    if (chargeCoreService.checkBackwardRelayOffline(modbusTCPMaster)) {
                        redis.deleteMap(RedisConstant.AGV_CHARGE_FLAG, key);
                        log.info("charge over by handle:{}", agvDetail.getAgvId$());
                    } else {
                        log.info("手动后退到位信号失败：车号：{}", agvDetail.getAgvId$());
                    }
                    break;
//                case 3:
//                    // 手动断开充电
//                    // 前进信号存在，说明机械臂未伸回
//                    if (chargeCoreService.checkForwardRelayOnline(modbusTCPMaster)) {
//                        log.info("发送充电机手动断充指令：车号：{}", agvDetail.getAgvId$());
//                        chargeCoreService.stopCharging(modbusTCPMaster);
//                        continue;
//                    }
//                    if (chargeCoreService.checkBackwardRelayOffline(modbusTCPMaster)) {
//                        redis.deleteMap(RedisConstant.AGV_CHARGE_FLAG, key);
//                        log.info("charge over by handle:{}", agvDetail.getAgvId$());
//                    } else {
//                        log.info("手动后退到位信号失败：车号：{}", agvDetail.getAgvId$());
//                    }
//                    break;
                default:
                    log.error("charge status error: {}", status);
                    break;