From a7223a5dfc7c83c7fe3894e65d1fed84cae61a8e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 08:45:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/MatDto.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e5b625b..f3c808f 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -1,5 +1,6 @@
 package com.zy.common.model;
 
+import com.zy.asrs.entity.OrderDetl;
 import lombok.Data;
 
 /**
@@ -9,20 +10,32 @@
 public class MatDto {
 
     // 鐗╂枡缂栧彿
-    private String matNo;
+    private String matnr;
 
     // 鐗╂枡鍚嶇О
-    private String maknx;
+    private String model;
 
-    // 鐗╂枡鏁伴噺
+    // 鏉$爜
+    private String batch;
+
+    // 璁㈠崟缂栧彿
+    private String orderNo;
+
+    // 宸插嚭
     private Double count;
+
+    // 鎬绘暟閲�
+    private Double total;
 
     public MatDto() {
     }
 
-    public MatDto(String matNo, String maknx, Double count) {
-        this.matNo = matNo;
-        this.maknx = maknx;
-        this.count = count;
+    public MatDto(OrderDetl orderDetl) {
+        this.matnr = orderDetl.getMatnr();
+        this.model = orderDetl.getModel();
+        this.batch = orderDetl.getBatch();
+        this.orderNo = orderDetl.getOrderNo();
+        this.count = orderDetl.getQty();
+        this.total = orderDetl.getAnfme();
     }
 }

--
Gitblit v1.9.1