#

luxiaotao1123

2024-11-18 18959656f9bf75e40a5802c3befd545ec33621d7

#

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

@@ -276,6 +276,11 @@
//                                    .map(BlockVehicleDto::getVehicle)
//                                    .findFirst().orElse(null);
                            String blockAgvNo = this.checkoutBestSolutionOfBlocks(blockVehicleList);
                            if (Cools.isEmpty(blockAgvNo)) {

                                maxJamTimeoutFactor = 2;

                            } else {

                            // block vehicle info
                            Agv blockAgv = agvService.selectByUuid(blockAgvNo);
@@ -320,6 +325,8 @@

                    }

                    }

                    // handle jam timeout
                    if (null != maxJamTimeoutFactor) {
                        if (System.currentTimeMillis() - jam.getStartTime().getTime() > MAX_JAM_TIMEOUT * maxJamTimeoutFactor) {

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java

@@ -48,7 +48,7 @@
     */
    @Override
    public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
        return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, null, null);
        return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null);
    }

    @Override