From 8482d4e5969a324fd30406fb488eea265e78a49a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 09 三月 2026 19:33:33 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/common/model/DetlDto.java |  231 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 168 insertions(+), 63 deletions(-)

diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index eb5e7d1..dda2516 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -17,58 +17,27 @@
 
     private String orderNo;
 
+    private Long orderId;
+
     private String matnr;
+
 
     private String batch = "";
     private String brand = "";
     private String standby1 = "";
     private String standby2 = "";
     private String standby3 = "";
+
     private Long lineNumber = 1L;
 
+    private String boxType1 = "1";
+    private String boxType2 = "1";
+    private String boxType3 = "1";
+
     private Double anfme;
+    private String threeCode;
 
     public DetlDto() {
-    }
-
-    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, Double anfme) {
-        this.matnr = matnr;
-        this.batch = batch;
-        this.brand = brand;
-        this.standby1 = standby1;
-        this.standby2 = standby2;
-        this.standby3 = standby3;
-        this.lineNumber = lineNumber;
-        this.anfme = anfme;
-    }
-
-    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double anfme) {
-        this.matnr = matnr;
-        this.batch = batch;
-        this.brand = brand;
-        this.standby1 = standby1;
-        this.standby2 = standby2;
-        this.standby3 = standby3;
-        this.anfme = anfme;
-    }
-
-    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber) {
-        this.matnr = matnr;
-        this.batch = batch;
-        this.brand = brand;
-        this.standby1 = standby1;
-        this.standby2 = standby2;
-        this.standby3 = standby3;
-        this.lineNumber = lineNumber;
-    }
-
-    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
-        this.matnr = matnr;
-        this.batch = batch;
-        this.brand = brand;
-        this.standby1 = standby1;
-        this.standby2 = standby2;
-        this.standby3 = standby3;
     }
 
     public DetlDto(String matnr, Double anfme) {
@@ -94,6 +63,97 @@
         this.anfme = anfme;
     }
 
+    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String threeCode) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.brand = brand;
+        this.standby1 = standby1;
+        this.standby2 = standby2;
+        this.standby3 = standby3;
+        this.boxType1 = boxType1;
+        this.boxType2 = boxType2;
+        this.boxType3 = boxType3;
+        this.threeCode = threeCode;
+    }
+
+    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, String threeCode) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.brand = brand;
+        this.standby1 = standby1;
+        this.standby2 = standby2;
+        this.standby3 = standby3;
+        this.lineNumber = lineNumber;
+        this.boxType1 = boxType1;
+        this.boxType2 = boxType2;
+        this.boxType3 = boxType3;
+        this.threeCode = threeCode;
+
+    }
+
+    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.brand = brand;
+        this.standby1 = standby1;
+        this.standby2 = standby2;
+        this.standby3 = standby3;
+        this.boxType1 = boxType1;
+        this.boxType2 = boxType2;
+        this.boxType3 = boxType3;
+        this.anfme = anfme;
+        this.threeCode = threeCode;
+
+    }
+
+    public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.brand = brand;
+        this.standby1 = standby1;
+        this.standby2 = standby2;
+        this.standby3 = standby3;
+        this.lineNumber = lineNumber;
+        this.boxType1 = boxType1;
+        this.boxType2 = boxType2;
+        this.boxType3 = boxType3;
+        this.anfme = anfme;
+        this.threeCode = threeCode;
+
+    }
+
+    public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
+        this.orderNo = orderNo;
+        this.matnr = matnr;
+        this.batch = batch;
+        this.brand = brand;
+        this.standby1 = standby1;
+        this.standby2 = standby2;
+        this.standby3 = standby3;
+        this.boxType1 = boxType1;
+        this.boxType2 = boxType2;
+        this.boxType3 = boxType3;
+        this.anfme = anfme;
+        this.threeCode = threeCode;
+    }
+
+    public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
+        this.orderNo = orderNo;
+        this.matnr = matnr;
+        this.batch = batch;
+        this.brand = brand;
+        this.standby1 = standby1;
+        this.standby2 = standby2;
+        this.standby3 = standby3;
+        this.lineNumber = lineNumber;
+        this.boxType1 = boxType1;
+        this.boxType2 = boxType2;
+        this.boxType3 = boxType3;
+        this.anfme = anfme;
+        this.threeCode = threeCode;
+
+    }
+
     public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
         for (DetlDto dto : detlDtos) {
 //            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
@@ -108,7 +168,9 @@
 //                    }
             if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
                     && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
-                    && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())) {
+                    && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
+                    && Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
                 return true;
             }
 //                }
@@ -132,7 +194,9 @@
             if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
                     && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
                     && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
-                    && dto.getLineNumber().equals(orderDetl.getLineNumber())) {
+                    && dto.getLineNumber().equals(orderDetl.getLineNumber())
+                    && Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
                 return true;
             }
 //                }
@@ -145,7 +209,9 @@
         for (DetlDto dto : detlDtos) {
             if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
                     && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
-                    && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())) {
+                    && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
+                    && Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
                 return true;
             }
         }
@@ -156,7 +222,9 @@
         for (DetlDto dto : detlDtos) {
             if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
                     && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
-                    && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())) {
+                    && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
+                    && Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
                 return true;
             }
         }
@@ -167,40 +235,44 @@
         for (DetlDto dto : detlDtos) {
             if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
                     && Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
-                    && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())) {
+                    && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
+                    && Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
                 return true;
             }
         }
         return false;
     }
+
+    public static boolean hasOrder(List<DetlDto> detlDtos, DetlDto detlDto) {
+        for (DetlDto dto : detlDtos) {
+            if (dto.getOrderNo().equals(detlDto.getOrderNo()) && dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
+                    && Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
+                    && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
+                    && Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 
     public static boolean hasLineNumber(List<DetlDto> detlDtos, DetlDto detlDto) {
         for (DetlDto dto : detlDtos) {
             if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
                     && Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
                     && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
-                    && dto.getLineNumber().equals(detlDto.getLineNumber())) {
+                    && dto.getLineNumber().equals(detlDto.getLineNumber())
+                    && Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
+                    && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
                 return true;
             }
         }
         return false;
     }
 
-    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
-        if (Cools.isEmpty(matnr)) {
-            return null;
-        }
-        for (DetlDto detlDto : detlDtos) {
-            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
-                    && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
-                    && standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())) {
-                return detlDto;
-            }
-        }
-        return null;
-    }
-
-    public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3,Long lineNumber) {
+    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         if (Cools.isEmpty(matnr)) {
             return null;
         }
@@ -208,7 +280,25 @@
             if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
                     && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
                     && standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())
-                    && lineNumber.equals(detlDto.getLineNumber())) {
+                    && boxType1.equals(detlDto.getBoxType1()) && boxType2.equals(detlDto.getBoxType2())
+                    && boxType3.equals(detlDto.getBoxType3())) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
+    public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3,Long lineNumber, String boxType1, String boxType2, String boxType3) {
+        if (Cools.isEmpty(matnr)) {
+            return null;
+        }
+        for (DetlDto detlDto : detlDtos) {
+            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+                    && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
+                    && standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())
+                    && lineNumber.equals(detlDto.getLineNumber())
+                    && boxType1.equals(detlDto.getBoxType1()) && boxType2.equals(detlDto.getBoxType2())
+                    && boxType3.equals(detlDto.getBoxType3())) {
                 return detlDto;
             }
         }
@@ -222,7 +312,22 @@
         for (DetlDto detlDto : detlDtos) {
             if (detlDtoB.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(detlDtoB.getBatch(), detlDto.getBatch())
                     && detlDtoB.getBrand().equals(detlDto.getBrand()) && detlDtoB.getStandby1().equals(detlDto.getStandby1())
-                    && detlDtoB.getStandby2().equals(detlDto.getStandby2()) && detlDtoB.getStandby3().equals(detlDto.getStandby3())) {
+                    && detlDtoB.getStandby2().equals(detlDto.getStandby2()) && detlDtoB.getStandby3().equals(detlDto.getStandby3())
+                    && detlDtoB.getBoxType1().equals(detlDto.getBoxType1()) && detlDtoB.getBoxType2().equals(detlDto.getBoxType2())
+                    && detlDtoB.getBoxType3().equals(detlDto.getBoxType3())) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
+
+    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()) && Cools.eq(batch, detlDto.getBatch())) {
                 return detlDto;
             }
         }

--
Gitblit v1.9.1