From 287170042ad762d32ca574a5ed692648ea8e002f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 四月 2025 08:56:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/DetlDto.java |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 111 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 b08db0c..bec1738 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -2,6 +2,7 @@
 
 import com.core.common.Cools;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.OpenOrderPakinJDParam;
 import lombok.Data;
 
 import java.util.List;
@@ -21,10 +22,28 @@
     private Double anfme;
 
     private int owner;
+    private String ownerName;
+    private int beBatch;
+
+    private int payment;
 
     private Double weight;
+    private String memo;
+
+    private String sourceLocName;//婧愪粨搴�
+    private String targetLocName;//鐩爣浠撳簱
+
 
     public DetlDto() {
+    }
+
+    public DetlDto(OpenOrderPakinJDParam.DetlDto2 detlDto2) {
+        this.matnr=detlDto2.getMatnr();
+        this.batch=detlDto2.getBatch();
+        this.anfme=detlDto2.getAnfme();
+        this.ownerName=detlDto2.getOwner();
+        this.beBatch=detlDto2.getEntryId();
+        this.payment=0;
     }
 
     public DetlDto(String matnr, Double anfme) {
@@ -49,6 +68,29 @@
         this.batch = batch;
         this.anfme = anfme;
         this.owner = owner;
+    }
+
+    public DetlDto(String matnr, String batch, Double anfme,int owner,Double weight) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.owner = owner;
+        this.weight = weight;
+    }
+
+    public DetlDto(String matnr, String batch, Double anfme,Double weight) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.weight = weight;
+    }
+
+    public DetlDto(String matnr, String batch, Double anfme,String ownerName,int payment) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.ownerName = ownerName;
+        this.payment = payment;
     }
 
 
@@ -78,12 +120,80 @@
         return false;
     }
 
+    public static boolean has1(List<DetlDto> detlDtos, DetlDto detlDto) {
+        for (DetlDto dto : detlDtos) {
+            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getOwnerName(), detlDto.getOwnerName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean has2(List<DetlDto> detlDtos, DetlDto detlDto) {
+        for (DetlDto dto : detlDtos) {
+            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
+                    && Cools.eq(dto.getOwnerName(), detlDto.getOwnerName()) && dto.getBeBatch()==detlDto.getBeBatch()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean has3(List<DetlDto> detlDtos, DetlDto detlDto) {
+        for (DetlDto dto : detlDtos) {
+            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getOwnerName(), detlDto.getOwnerName())
+                    && Cools.eq(dto.getSourceLocName(), detlDto.getSourceLocName()) && Cools.eq(dto.getTargetLocName(), detlDto.getTargetLocName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     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())) {
+            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) ) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
+    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String ownerName) {
+        if (Cools.isEmpty(matnr)) {
+            return null;
+        }
+        for (DetlDto detlDto : detlDtos) {
+            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) && Cools.eq(ownerName, detlDto.getOwnerName())) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
+    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String ownerName,int beBatch) {
+        if (Cools.isEmpty(matnr)) {
+            return null;
+        }
+        for (DetlDto detlDto : detlDtos) {
+            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+                    && Cools.eq(ownerName, detlDto.getOwnerName()) && beBatch== detlDto.getBeBatch()) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
+    public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String ownerName,String sourceLocName,String targetLocName) {
+        if (Cools.isEmpty(matnr)) {
+            return null;
+        }
+        for (DetlDto detlDto : detlDtos) {
+            if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+                    && Cools.eq(ownerName, detlDto.getOwnerName()) && Cools.eq(sourceLocName, detlDto.getSourceLocName())
+                    && Cools.eq(targetLocName, detlDto.getTargetLocName())) {
                 return detlDto;
             }
         }

--
Gitblit v1.9.1