From 056fcd9258c821a27624459a49a78ea9a7686a5f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 九月 2023 13:54:23 +0800
Subject: [PATCH] #订单出库有小数时，优先出小数
---
src/main/java/com/zy/common/model/DetlDto.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 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..db0e9eb 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -13,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() {
}
@@ -38,15 +44,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