From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/common/model/DetlDto.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 2db5768..a952d6b 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -1,7 +1,7 @@
package com.zy.common.model;
import com.core.common.Cools;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;
import java.util.List;
@@ -21,13 +21,23 @@
private String fromOrderNo; //鏉ユ簮鍗曞彿
private String memo; //澶囨敞
private String mark;
- private String customer;
- private String suppName;
+ 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;
+ private String batchNum;
+ private String code;
+ private String productionCode;
public DetlDto() {
}
- public DetlDto(String matnr, String batch, Double anfme,String fromOrderNo,String mark,String customer,String suppName) {
+ 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;
@@ -35,6 +45,10 @@
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) {
@@ -52,7 +66,8 @@
this.batch = batch;
this.anfme = anfme;
}
- public DetlDto(String matnr, String batch, Double anfme,String mark) {
+
+ public DetlDto(String matnr, String batch, Double anfme, String mark) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
@@ -66,15 +81,15 @@
this.anfme = anfme;
}
- public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
+ public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakout orderDetlPakout) {
for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+ if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetlPakout.getBatch())) {
+ if (dto.getMatnr().equals(orderDetlPakout.getMatnr())) {
return true;
}
} else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+ if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetlPakout.getBatch())) {
+ if (dto.getMatnr().equals(orderDetlPakout.getMatnr()) && dto.getBatch().equals(orderDetlPakout.getBatch())) {
return true;
}
}
@@ -85,7 +100,7 @@
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())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getFromOrderNo(), detlDto.getFromOrderNo())) {
return true;
}
}
@@ -104,4 +119,19 @@
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