#

luxiaotao1123

2024-11-15 8e6a6ee229b8a14ec3cac6b428921cbde8dcf53d

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

@@ -93,7 +93,7 @@
            if (!Cools.isEmpty(waitingSegList)) {
                for (Segment waitingSeg : waitingSegList) {
                    if (!waitingSeg.getId().equals(segment.getId())) {
                        log.error("AGV[{}] 任务异常，服务器错误！！！", agv.getUuid());
//                        log.error("AGV[{}] 任务异常，服务器错误！！！", agv.getUuid());
                        return;
                    }
                }
@@ -453,11 +453,13 @@
            if (!segmentService.save(insertSeg)) {
                log.error("Segment [{}] 保存失败 ！！！", segment.getTravelId() + " - " + segment.getSerial());
                return false;
            } else {
                jam.setAvoSeg(insertSeg.getId());
            }

        } else {

            return mainLockWrapService.buildMinorTask(agv, null, TaskTypeType.MOVE, endCodeData);
            return mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, endCodeData, jam);
        }

        return true;