From 1aae6f4bd840a202ee9db3efa3f6776cd10b81f9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 09:09:45 +0800
Subject: [PATCH] #bug修复
---
src/main/java/com/zy/common/model/OutLocDto.java | 21 ++++++++++++++++-----
1 files changed, 16 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..0a4ff1e 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -18,6 +18,16 @@
private String locNo;
+ public boolean sign=false;
+
+ public boolean isSign() {
+ return sign;
+ }
+
+ public void setSign(boolean sign) {
+ this.sign = sign;
+ }
+
private List<LocDetlDto> locDetlDtos = new ArrayList<>();
public OutLocDto() {
@@ -26,6 +36,7 @@
public OutLocDto(String locNo, LocDetlDto locDetlDto) {
this.locNo = locNo;
this.locDetlDtos.add(locDetlDto);
+ this.sign = locDetlDto.isSign();
}
public boolean isAll(){
@@ -40,17 +51,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