From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 14 三月 2024 10:14:28 +0800 Subject: [PATCH] 1.增加牌号作为唯一物料条件 (当前牌号 批号 包号可以筛选出唯一物料) 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善 --- 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