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

zjj

昨天 11e2b6d43b6c1664f74963649dad9507db34c6ae

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

@@ -431,7 +431,7 @@
        }
        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("判断站点数据错误");
            }