From 24b39a858545b192bbba4ee336af201b45f4d1dd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 24 十二月 2024 16:04:22 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 7e719d2..eb5e7d1 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -24,10 +24,22 @@
     private String standby1 = "";
     private String standby2 = "";
     private String standby3 = "";
+    private Long lineNumber = 1L;
 
     private Double anfme;
 
     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) {
@@ -38,6 +50,16 @@
         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) {
@@ -95,6 +117,30 @@
         return false;
     }
 
+    public static boolean hasListLineNumber(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
+        for (DetlDto dto : detlDtos) {
+//            if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
+//                if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+//                    return true;
+//                }
+//            } else
+//            {
+//                if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
+//                    if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+//                        return true;
+//                    }
+            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())) {
+                return true;
+            }
+//                }
+//            }
+        }
+        return false;
+    }
+
     public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakin orderDetl) {
         for (DetlDto dto : detlDtos) {
             if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
@@ -128,6 +174,18 @@
         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())) {
+                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;
@@ -142,6 +200,21 @@
         return null;
     }
 
+    public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3,Long lineNumber) {
+        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())) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
     public static DetlDto findDto(List<DetlDto> detlDtos,DetlDto detlDtoB) {
         if (Cools.isEmpty(detlDtoB)) {
             return null;

--
Gitblit v1.9.1