#

zjj

2025-02-11 084dbf57d6c158a3bb126e015840498c8c6e0199

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -78,8 +78,6 @@
        }

        EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper2);
        wrapper2.eq("type_no",103);
        List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
        List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
@@ -169,13 +167,19 @@
    @RequestMapping("/available/empty/take/site")
    @ManagerAuth()
    public R availableEmptyTakeSite(){
        List<Map<String, Object>> result = new ArrayList<>();
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        wrapper.eq("type_no",110);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
//        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        List<StaDesc> staDescs = staDescService.selectList(wrapper);
        List<Integer> collect = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
        return R.ok().add(collect);
        for (StaDesc staDesc : staDescs) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", staDesc.getStnNo());
            map.put("desc","["+ Utils.getStaName(staDesc.getStnNo())+"]");
            result.add(map);
        }
        return R.ok().add(result);
//        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
    }