From facf9495e8e73c72b63996f416874657f30068bd Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 27 九月 2025 13:19:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 52c88b4..a95f71e 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -425,13 +425,18 @@ } 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(locDto1.getMatnr()) && + item.getBatch().equals(locDto1.getBatch()) + ).collect(Collectors.toList()); if (list.size() != 1){ throw new CoolException("鍒ゆ柇绔欑偣鏁版嵁閿欒"); } -- Gitblit v1.9.1