From 4dca5d65e2518f019ce25c805827211e0509598f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 25 二月 2025 14:06:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/model/TaskDto.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 515ccd5..7ded416 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -110,24 +110,36 @@
if (!dto.getMatnr().equals(locDetl.getMatnr())) {
continue;
}
- if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+ if(!Cools.eq(dto.getBatch(),locDetl.getBatch())){
continue;
}
- if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
+ if(!Cools.eq(dto.getCsocode(),locDetl.getThreeCode())){
continue;
}
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
- if (!dto.getBatch().equals(locDetl.getBatch())) {
- continue;
- }
+ if(!Cools.eq(dto.getIsoseq(),locDetl.getDeadTime())){
+ continue;
}
- if (!Cools.isEmpty(dto.getContainerCode()) && !Cools.isEmpty(locDetl.getSuppCode())) {
- if (!dto.getContainerCode().equals(locDetl.getSuppCode())) {
- continue;
- }
+ if(!Cools.eq(dto.getContainerCode(),locDetl.getSuppCode())){
+ continue;
}
+// if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// }
+// if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// }
+// if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+// if (!dto.getBatch().equals(locDetl.getBatch())) {
+// continue;
+// }
+// }
+// if (!Cools.isEmpty(dto.getContainerCode()) && !Cools.isEmpty(locDetl.getSuppCode())) {
+// if (!dto.getContainerCode().equals(locDetl.getSuppCode())) {
+// continue;
+// }
+// }
if (dto.getAnfme() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("鏁伴噺瓒呰繃锛岃妫�鏌ュ簱瀛�");
}
if (dto.getAnfme().equals(locDetl.getAnfme())) {
sameNumber++;
--
Gitblit v1.9.1