From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/model/DetlDto.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 7 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..d04cdc5 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,20 +13,62 @@
@Data
public class DetlDto {
- private String orderNo;
-
- private String matnr;
-
- private String batch;
-
- private Double anfme;
+ private String matnr; //鐗╂枡缂栫爜
+ private String maktx; //鐗╂枡鍚嶇О
+ private String batch; //鎵规
+ private Double anfme; //鏁伴噺
+ private String orderNo; //璁㈠崟鍙�
+ private String fromOrderNo; //鏉ユ簮鍗曞彿
+ private String memo; //澶囨敞
+ private String mark;
+ private String customer = ""; //瀹㈡埛鍚嶇О
+ private String suppName = ""; //渚涘簲鍟�
+ private String temp1 = "";
+ private String temp2 = "";
+ private String temp3 = "";
+ private String temp4 = "";
+ private Double actulQty;
+ private Integer danger;
+ private Integer quality;
public DetlDto() {
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme, String fromOrderNo, String mark, String customer, String suppName, String temp1, String temp2, String temp3, String temp4) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.fromOrderNo = fromOrderNo;
+ this.mark = mark;
+ this.customer = customer;
+ this.suppName = suppName;
+ this.temp1 = temp1;
+ this.temp2 = temp2;
+ this.temp3 = temp3;
+ this.temp4 = temp4;
}
public DetlDto(String matnr, Double anfme) {
this.matnr = matnr;
this.anfme = anfme;
+ }
+
+ 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;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme, String mark) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.mark = mark;
}
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
@@ -30,4 +77,57 @@
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;
+ }
+ }
+ }
+ }
+ 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()) && dto.getFromOrderNo().equals(detlDto.getFromOrderNo())) {
+ 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;
+ }
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String threeCode) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ if (Cools.isEmpty(threeCode)){
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) && threeCode.equals(detlDto.getFromOrderNo())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1