From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/common/model/DetlDto.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d04cdc5..a952d6b 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -1,7 +1,7 @@
package com.zy.common.model;
import com.core.common.Cools;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;
import java.util.List;
@@ -30,6 +30,9 @@
private Double actulQty;
private Integer danger;
private Integer quality;
+ private String batchNum;
+ private String code;
+ private String productionCode;
public DetlDto() {
}
@@ -78,15 +81,15 @@
this.anfme = anfme;
}
- public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
+ public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakout orderDetlPakout) {
for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+ if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetlPakout.getBatch())) {
+ if (dto.getMatnr().equals(orderDetlPakout.getMatnr())) {
return true;
}
} else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+ if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetlPakout.getBatch())) {
+ if (dto.getMatnr().equals(orderDetlPakout.getMatnr()) && dto.getBatch().equals(orderDetlPakout.getBatch())) {
return true;
}
}
@@ -97,7 +100,7 @@
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && dto.getFromOrderNo().equals(detlDto.getFromOrderNo())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getFromOrderNo(), detlDto.getFromOrderNo())) {
return true;
}
}
@@ -115,11 +118,12 @@
}
return null;
}
- public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String threeCode) {
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String threeCode) {
if (Cools.isEmpty(matnr)) {
return null;
}
- if (Cools.isEmpty(threeCode)){
+ if (Cools.isEmpty(threeCode)) {
return null;
}
for (DetlDto detlDto : detlDtos) {
--
Gitblit v1.9.1