From c8ec0494e03be47ec0f1b3a89ad5e0a004bd7501 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 12:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/common/model/DetlDto.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..40c59e0 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -15,11 +15,20 @@
private String orderNo;
+ //鏂欐兂鐮�
+ private String containerCode;
+
private String matnr;
private String batch;
private Double anfme;
+
+ //閿�鍞鍗曞彿
+ private String csocode;
+
+ //閿�鍞鍗曡鍙�
+ private String isoseq;
public DetlDto() {
}
@@ -40,11 +49,21 @@
this.anfme = anfme;
}
- public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
+ public DetlDto(String matnr, String batch, Double anfme, String csocode, String isoseq) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ }
+
+ public DetlDto(String orderNo, String matnr, String batch, Double anfme, String csocode, String isoseq) {
this.orderNo = orderNo;
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
}
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
@@ -66,19 +85,27 @@
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())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr())
+ && Cools.eq(dto.getContainerCode(), detlDto.getContainerCode())
+ && Cools.eq(dto.getBatch(), detlDto.getBatch())
+ && Cools.eq(dto.getCsocode(),detlDto.getCsocode())
+ && Cools.eq(dto.getIsoseq(),detlDto.getIsoseq())) {
return true;
}
}
return false;
}
- public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String csocode, String isoseq, String containerCode) {
if (Cools.isEmpty(matnr)) {
return null;
}
for (DetlDto detlDto : detlDtos) {
- if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
+ if (matnr.equals(detlDto.getMatnr())
+ && Cools.eq(containerCode, detlDto.getContainerCode())
+ && Cools.eq(batch, detlDto.getBatch())
+ && Cools.eq(csocode,detlDto.getCsocode())
+ && Cools.eq(isoseq,detlDto.getIsoseq())) {
return detlDto;
}
}
--
Gitblit v1.9.1