From e8cc8905586d191c7b9f5165d07b80d046dcc40e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 08:52:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/DetlDto.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 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 650e884..b0b3fbb 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;
@@ -13,7 +14,6 @@
@Data
public class DetlDto {
- private String orderNo;
private String matnr;
@@ -21,7 +21,22 @@
private Double anfme;
+ private int owner;
+ private String ownerName;
+
+ private int payment;
+
+ private Double weight;
+
public DetlDto() {
+ }
+
+ public DetlDto(OpenOrderPakinJDParam.DetlDto2 detlDto2) {
+ this.matnr=detlDto2.getMatnr();
+ this.batch=detlDto2.getBatch();
+ this.anfme=detlDto2.getAnfme();
+ this.ownerName=detlDto2.getOwner();
+ this.payment=0;
}
public DetlDto(String matnr, Double anfme) {
@@ -38,15 +53,40 @@
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
+ this.owner = 0;
}
- public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
- this.orderNo = orderNo;
+ 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())) {
--
Gitblit v1.9.1