From 32f3f3e2e358e87d4c4e7edb142943f107a0cccf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 15:02:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/MatDto.java |   53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 9dcf50d..7eb3532 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -10,10 +10,25 @@
 public class MatDto {
 
     // 鐗╂枡缂栧彿
-    private String matnr;
+    private String matNo;
+
+    // 鐗╂枡鍚嶇О
+    private String maknx;
+
+    // 搴撲綅瑙勬牸
+    private String specs;
+
+    // 鐗╂枡鏁伴噺
+    private Double count;
+
+    // 搴撲綅鏁伴噺
+    private Double total;
 
     // 鐗╂枡鍚嶇О
     private String model;
+
+    // 绠辩爜
+    private String containerCode;
 
     // 鏉$爜
     private String batch;
@@ -21,21 +36,41 @@
     // 璁㈠崟缂栧彿
     private String orderNo;
 
-    // 宸插嚭
-    private Double count;
-
-    // 鎬绘暟閲�
-    private Double total;
-
     public MatDto() {
     }
 
     public MatDto(OrderDetl orderDetl) {
-        this.matnr = orderDetl.getMatnr();
+        this.matNo = orderDetl.getMatnr();
         this.model = orderDetl.getModel();
         this.batch = orderDetl.getBatch();
         this.orderNo = orderDetl.getOrderNo();
-        this.count = orderDetl.getQty() + orderDetl.getWeight();
+        this.count = orderDetl.getQty();
         this.total = orderDetl.getAnfme();
     }
+    public MatDto(String matNo, String maknx, Double count) {
+        this.matNo = matNo;
+        this.maknx = maknx;
+        this.count = count;
+    }
+    public MatDto(String matNo, String maknx, Double count,String specs) {
+        this.specs = specs;
+        this.matNo = matNo;
+        this.maknx = maknx;
+        this.count = count;
+    }
+    public MatDto(String matNo, String maknx, Double count,Double total,String specs) {
+        this.specs = specs;
+        this.matNo = matNo;
+        this.maknx = maknx;
+        this.count = count;
+        this.total = total;
+    }
+    public MatDto(String matNo, String maknx, Double count,Double total,String specs,String containerCode) {
+        this.containerCode = containerCode;
+        this.specs = specs;
+        this.matNo = matNo;
+        this.maknx = maknx;
+        this.count = count;
+        this.total = total;
+    }
 }

--
Gitblit v1.9.1