From dddc2cadc0bd18c79f565a733d694c5f4b869843 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 23 九月 2025 15:45:54 +0800
Subject: [PATCH] 正式环境数据库

---
 src/main/java/com/zy/common/model/DetlDto.java |   80 +++++++++++++++++++++++++++-------------
 1 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index e2e8bb3..ae3b160 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -15,11 +15,22 @@
 
     private String orderNo;
 
+    private String orderNo$;
+
     private String matnr;
+
+    private String maktx;
 
     private String batch;
 
     private Double anfme;
+
+    private String memo;
+
+    private String cstmr;
+
+    private Long owner;
+
 
     public DetlDto() {
     }
@@ -29,18 +40,55 @@
         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 orderNo, String matnr, String batch, Double anfme) {
-        this.orderNo = orderNo;
+    public DetlDto(String matnr,String maktx, String batch, Double anfme) {
         this.matnr = matnr;
+        this.maktx = maktx;
         this.batch = batch;
         this.anfme = anfme;
     }
+
+    public DetlDto(String matnr, String batch, Double anfme,Long owner) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.owner = owner;
+    }
+
+
+//    public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
+//        this.orderNo = orderNo;
+//        this.matnr = matnr;
+//        this.batch = batch;
+//        this.anfme = anfme;
+//    }
+
+    public DetlDto(String matnr, String batch, Double anfme, String memo, String cstmr) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.memo = memo;
+        this.cstmr = cstmr;
+    }
+
+    public DetlDto(String matnr, String batch, Double anfme, String memo, String cstmr,Long owner) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.memo = memo;
+        this.cstmr = cstmr;
+        this.owner = owner;
+    }
+
 
     public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
         for (DetlDto dto : detlDtos) {
@@ -61,16 +109,8 @@
 
     public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
         for (DetlDto dto : detlDtos) {
-            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(detlDto.getBatch())) {
-                if (dto.getMatnr().equals(detlDto.getMatnr())) {
-                    return true;
-                }
-            } else {
-                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(detlDto.getBatch())) {
-                    if (dto.getMatnr().equals(detlDto.getMatnr()) && dto.getBatch().equals(detlDto.getBatch())) {
-                        return true;
-                    }
-                }
+            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+                return true;
             }
         }
         return false;
@@ -81,19 +121,7 @@
             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