1
zhang
15 小时以前 3a49654f51096d4f9f95f4a5e8198e168e38a0c5
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -255,24 +255,24 @@
            } else {
                // complete first segment then merge behind segment
                int serial = segment.getSerial();
                boolean interrupt = false;
                while (!interrupt) {
                    Segment nextStep = segmentService.getNextStepOfInit(travel.getId(), serial);
                    serial ++;
                    if (null == nextStep) {
                        interrupt = true;
                    } else {
                        if (nextStep.getEndNode() == endNode) {
                            segmentList.add(nextStep);
                        } else {
                            interrupt = true;
                        }
                    }
                }
//                int serial = segment.getSerial();
//                boolean interrupt = false;
//                while (!interrupt) {
//
//                    Segment nextStep = segmentService.getNextStepOfInit(travel.getId(), serial);
//                    serial ++;
//                    if (null == nextStep) {
//                        interrupt = true;
//                    } else {
//                        if (nextStep.getEndNode() == endNode) {
//
//                            segmentList.add(nextStep);
//                        } else {
//                            interrupt = true;
//                        }
//                    }
//
//                }
            }
            mapService.lockPath(null, pathList, agv.getUuid());