Merge branch 'rcs_master' into ctu_conveyor

zhang

7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java

@@ -134,7 +134,7 @@

    private Integer getBackpack(Long agvId, String backpackJson) {
        if (null == agvId || Cools.isEmpty(backpackJson)) {
            return null;
            return 0;
        }
        List<BackpackDto> backpackDtoList = JSON.parseArray(backpackJson, BackpackDto.class);
        int jsonCount = (int) backpackDtoList.stream().filter(BackpackDto::getLoaded).count();