From 08ae160eb43adaebc03e6e05e94575b9baad059c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:10:45 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index daf439e..c8cf956 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -2,8 +2,11 @@
 
 import com.core.common.Cools;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.utils.MatCompareUtils;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -20,62 +23,76 @@
 
     private Double anfme;
 
-    public DetlDto() {
+    private String sPgNO;
+
+    private String outOrderNo;
+
+    private String luHao;
+
+    private String packing;
+
+    private String proType;
+
+    private String color;
+
+
+    public DetlDto(LocDto locDto) {
+        this.matnr = locDto.getMatnr();
+        this.batch = locDto.getBatch();
+        this.sPgNO = locDto.getSPgNO();
+        this.outOrderNo = locDto.getOutOrderNo();
+        this.luHao = locDto.getLuHao();
+        this.packing = locDto.getPacking();
+        this.proType = locDto.getProType();
+        this.orderNo = locDto.getOrderNo();
+        this.anfme = locDto.getAnfme();
+        this.color = locDto.getColor();
     }
 
-    public DetlDto(String matnr, Double anfme) {
-        this.matnr = matnr;
-        this.anfme = anfme;
-    }
 
-    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;
-        this.matnr = matnr;
-        this.batch = batch;
-        this.anfme = anfme;
-    }
 
     public static boolean hasList(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;
-                    }
-                }
+            boolean compare = MatCompareUtils.compare(dto, orderDetl);
+            if (compare) {
+                return true;
             }
+//            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;
+//                    }
+//                }
+//            }
         }
         return false;
     }
 
-    public static DetlDto find(Set<DetlDto> detlDtos, String matnr, String batch) {
-        if (Cools.isEmpty(matnr)) {
+    public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
+        for (DetlDto dto : detlDtos) {
+            boolean compare = MatCompareUtils.compare(dto, detlDto);
+            if (compare) {
+                return true;
+            }
+//            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+//                return true;
+//            }
+        }
+        return false;
+    }
+
+    public static DetlDto find(List<DetlDto> detlDtos, LocDto locDto) {
+        if (Cools.isEmpty(locDto)) {
             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())) {
+            boolean compare = MatCompareUtils.compare(detlDto, locDto);
+            if (compare) {
                 return detlDto;
             }
         }

--
Gitblit v1.9.1