From 61d28206585b8746a9f1982cfe1dfc5deabde91a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 17 六月 2023 09:03:27 +0800
Subject: [PATCH] #库存统计更改为包括立库、平库

---
 src/main/java/com/zy/common/model/DetlDto.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 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..4dc94d0 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -13,13 +13,18 @@
 @Data
 public class DetlDto {
 
-    private String orderNo;
 
     private String matnr;
 
     private String batch;
 
     private Double anfme;
+
+    private int owner;
+
+    private int payment;
+
+    private Double weight;
 
     public DetlDto() {
     }
@@ -38,15 +43,32 @@
         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 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