1

zhangc

2025-04-18 28630a015ee530dc14373976b066578f929620d1

1

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

@@ -67,12 +67,12 @@
    @RequestMapping("/available/take/site")
    @ManagerAuth()
    public R availableTakeSite() {
        Set<Map<String, Object>> result = new HashSet<>();
        Set<Map<String, Object>> result = new TreeSet<>();
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        wrapper.eq("type_no", 101);
        wrapper.orderBy("stn_no", false);
        wrapper.orderBy("stn_no", true);
        List<StaDesc> staDescs = staDescService.selectList(wrapper);
        //  List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
//        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
@@ -85,6 +85,7 @@

        EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
        wrapper2.eq("type_no", 103);
        wrapper.orderBy("stn_no", true);
        List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
        //  List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());