From 6d75b9bda39c710153183844ba1e8effbb730de1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 09:53:43 +0800
Subject: [PATCH] 单据、拣货单权限问题

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

diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 0729be7..db0e9eb 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -1,6 +1,11 @@
 package com.zy.common.model;
 
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
 import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * Created by vincent on 2022/3/25
@@ -8,13 +13,19 @@
 @Data
 public class DetlDto {
 
-    private String orderNo;
 
     private String matnr;
 
     private String batch;
 
     private Double anfme;
+
+    private int owner;
+    private String ownerName;
+
+    private int payment;
+
+    private Double weight;
 
     public DetlDto() {
     }
@@ -24,10 +35,85 @@
         this.anfme = anfme;
     }
 
-    public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
-        this.orderNo = orderNo;
+    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;
+        this.owner = 0;
     }
+
+    public DetlDto(String matnr, String batch, Double anfme,int owner) {
+        this.matnr = matnr;
+        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;
+    }
+
+
+    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;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
+        for (DetlDto dto : detlDtos) {
+            if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+                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())) {
+                return detlDto;
+            }
+        }
+        return null;
+    }
+
 }

--
Gitblit v1.9.1