Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-11-05 af11b74ea0ec26ed8765244b3f51fad5aca9142a

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

@@ -58,14 +58,28 @@
    @ManagerAuth()
    public R availableTakeSite(){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        wrapper.eq("type_no",101);
        List<StaDesc> staDescs = staDescService.selectList(wrapper);
        List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
//        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（全板出库口）");
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);

        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());

//        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);