#

vincentlu

1 天以前 d64ddaa5a1db6098a498a0c74d723068851cb088

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

@@ -259,6 +259,9 @@

                            // curr segment
                            Segment currSeg = segmentService.getCurrWaitingSeg(travel.getId(), agvId);
//                            if (null == currSeg) {
//                                currSeg = segmentService.getCurrRunningSeg(travel.getId(), agvId, null);
//                            }
                            if (null == currSeg) {
                                throw new CoolException("[Agv:" + agvNo + "] allocate inbound failed: no waiting segment");
                            }
@@ -1829,7 +1832,7 @@
                Code code = codeService.getCacheByData(agv_06_up.getQrCode());

                // query current segment
                Segment currSeg = segmentService.getCurrRunningSeg(agv.getId(), code.getId());
                Segment currSeg = segmentService.getCurrRunningSeg(null, agv.getId(), code.getId());
                if (null == currSeg) {
                    log.error("failed to find curr segment [{}]", agv.getUuid());
                } else {