From a9a8af3cd6e452cbcb8f8a046890cd5b36a61b17 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期三, 21 八月 2024 10:34:39 +0800 Subject: [PATCH] 档查询出来有多条数据时,加上数量条件,进行匹配,如果数量也匹配不上,就默认返回第一个 --- src/main/java/com/zy/common/model/OutLocDto.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java index 810abac..77e050b 100644 --- a/src/main/java/com/zy/common/model/OutLocDto.java +++ b/src/main/java/com/zy/common/model/OutLocDto.java @@ -40,17 +40,17 @@ for (LocDetl locDetl : locDetls) { Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator(); while (iterator.hasNext()) { - LocDetl next = iterator.next().getLocDetl(); - if (!next.getMatnr().equals(locDetl.getMatnr())) { + LocDetlDto next = iterator.next(); + if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) { continue; } - if (!Cools.eq(next.getBatch(), locDetl.getBatch())) { + if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) { continue; } - if (next.getAnfme() > locDetl.getAnfme()) { + if (next.getCount() > locDetl.getAnfme()) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"); } - if (next.getAnfme().equals(locDetl.getAnfme())) { + if (next.getCount().equals(locDetl.getAnfme())) { sameNumber++; iterator.remove(); break; -- Gitblit v1.9.1