From ecd79ff570939b55f455767f2b310590faa5a191 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:13:01 +0800
Subject: [PATCH] 1.新增组托时批号必须唯一 2.新增当有出库任务时禁止AGV入库搬运 3.拣料下架从任务状态16改成34
---
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