Merge branch 'rcs_master' into ctu_conveyor

zhang

7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

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

@@ -51,9 +51,9 @@
                    List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
                            .ge(Loc::getRow, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
                    if (Cools.isEmpty(locList)) {
                        log.error("there is no such idle loc");
                        break;
                    }
                    log.error("there is no such idle loc");
                    Collections.shuffle(locList);
                    Loc loc = locList.get(0);
                    dto.setDestLoc(loc.getLocNo());