From c42346453608186971fad5e80ffd08fd58d38d06 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:42:45 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/common/model/DetlDto.java |   21 ++++++++++++++++++++-
 1 files changed, 20 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..7ae4f91 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -29,6 +29,10 @@
     private String temp4 = "";
     private Double actulQty;
     private Integer danger;
+    private Integer quality;
+    private String batchNum;
+    private String code;
+    private String productionCode;
 
     public DetlDto() {
     }
@@ -96,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())) {
+            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) &&Cools.eq(dto.getFromOrderNo(),detlDto.getFromOrderNo())) {
                 return true;
             }
         }
@@ -115,4 +119,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