From 74546b829d63fd3ff7f625d5906536dbab511161 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 12:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/common/model/DetlDto.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 9837a5b..d04cdc5 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -29,6 +29,7 @@
private String temp4 = "";
private Double actulQty;
private Integer danger;
+ private Integer quality;
public DetlDto() {
}
@@ -96,7 +97,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())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && dto.getFromOrderNo().equals(detlDto.getFromOrderNo())) {
return true;
}
}
@@ -114,5 +115,19 @@
}
return null;
}
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String threeCode) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ if (Cools.isEmpty(threeCode)){
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) && threeCode.equals(detlDto.getFromOrderNo())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1