Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

9 天以前 3599feef955e2dcf974ecefeaeb7b28cacb97a73

Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

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

@@ -69,13 +69,8 @@
    public R availableTakeSite() {
        Set<Map<String, Object>> result = new HashSet<>();
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        wrapper.eq("type_no", 101);
        wrapper.orderBy("stn_no", true);
        wrapper.eq("type_no", 101).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);
        for (StaDesc site : staDescs) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", site.getStnNo());
@@ -84,12 +79,8 @@
        }

        EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
        wrapper2.eq("type_no", 103);
        wrapper.orderBy("stn_no", true);
        wrapper2.eq("type_no", 103).orderBy("stn_no", true);
        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 (StaDesc site : staDescs2) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", site.getStnNo());