From 296092f6666919867ac630efd986a60642e3d71e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 14 二月 2025 13:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/DetlDto.java | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index daf439e..d6d2cc3 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.OrderDetl;
import lombok.Data;
+import java.util.List;
import java.util.Set;
/**
@@ -12,15 +13,36 @@
@Data
public class DetlDto {
- private String orderNo;
-
- private String matnr;
-
- private String batch;
-
- private Double anfme;
+ private String matnr; //鐗╂枡缂栫爜
+ private String maktx; //鐗╂枡鍚嶇О
+ private String batch; //鎵规
+ private Double anfme; //鏁伴噺
+ private String orderNo; //璁㈠崟鍙�
+ private String fromOrderNo; //鏉ユ簮鍗曞彿
+ private String memo; //澶囨敞
+ private String mark;
+ private String customer = ""; //瀹㈡埛鍚嶇О
+ private String suppName = ""; //渚涘簲鍟�
+ private String temp1 = "";
+ private String temp2 = "";
+ private String temp3 = "";
+ private String temp4 = "";
public DetlDto() {
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme,String fromOrderNo,String mark,String customer,String suppName,String temp1,String temp2,String temp3,String temp4) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.fromOrderNo = fromOrderNo;
+ this.mark = mark;
+ this.customer = customer;
+ this.suppName = suppName;
+ this.temp1 = temp1;
+ this.temp2 = temp2;
+ this.temp3 = temp3;
+ this.temp4 = temp4;
}
public DetlDto(String matnr, Double anfme) {
@@ -28,10 +50,21 @@
this.anfme = anfme;
}
+ public DetlDto(String matnr, String batch) {
+ this.matnr = matnr;
+ this.batch = batch;
+ }
+
public DetlDto(String matnr, String batch, Double anfme) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
+ }
+ public DetlDto(String matnr, String batch, Double anfme,String mark) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.mark = mark;
}
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
@@ -58,24 +91,21 @@
return false;
}
- public static DetlDto find(Set<DetlDto> detlDtos, String matnr, String batch) {
+ 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())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
if (Cools.isEmpty(matnr)) {
return null;
}
for (DetlDto detlDto : detlDtos) {
- if (!matnr.equals(detlDto.getMatnr())) {
- continue;
- }
- if (Cools.isEmpty(batch) && Cools.isEmpty(detlDto.getBatch())) {
- return detlDto;
- }
- if (Cools.isEmpty(batch) && !Cools.isEmpty(detlDto.getBatch())) {
- continue;
- }
- if (Cools.isEmpty(detlDto.getBatch()) && !Cools.isEmpty(batch)) {
- continue;
- }
- if (batch.equals(detlDto.getBatch())) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
return detlDto;
}
}
--
Gitblit v1.9.1