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

zjj

2025-09-17 11e2b6d43b6c1664f74963649dad9507db34c6ae

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

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

@@ -67,7 +67,7 @@
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
//        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

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

@@ -425,13 +425,13 @@
    }
    public boolean Judge101or103(LocDto locDto,List<LocDto> locDtos){
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_No", locDto.getLocNo()));
        List<LocDto> dtos = locDtos.stream().filter(item -> !Cools.isEmpty(item.getLocNo()) && item.getLocNo().equals(locDto.getLocNo())).collect(Collectors.toList());
        List<LocDto> dtos = locDtos.stream().filter(item -> !Cools.isEmpty(item.getLocNo()) && item.getLocNo().equals(locDto.getLocNo()) ).collect(Collectors.toList());
        if (locDetlList.size() != dtos.size()){
            return false;
        }
        boolean is = true;
        for (LocDto locDto1 :dtos){
            List<LocDetl> list = locDetlList.stream().filter(item -> item.getLocNo().equals(locDto1.getLocNo()) && item.getBatch().equals(locDto1.getBatch())).collect(Collectors.toList());
            List<LocDetl> list = locDetlList.stream().filter(item -> item.getLocNo().equals(locDto1.getLocNo()) && item.getMatnr().equals(locDto.getMatnr()) && item.getBatch().equals(locDto1.getBatch())).collect(Collectors.toList());
            if (list.size() != 1){
                throw new CoolException("判断站点数据错误");
            }

 src/main/java/com/zy/common/constant/AgvSiteConstant.java

@@ -375,6 +375,16 @@
        put("d85","840085EE501013");


        put("e43","300042EE501013");
        put("e44","300043EE501013");
        put("e45","300044EE501013");
        put("e46","300045EE501013");
        put("e47","300046EE501013");
        put("a54","700053EB501013");
        put("a55","700054EB501013");
        put("a56","700055EB501013");
        put("a57","700056EB501013");
        put("a58","700057EB501013");

    }};