From e64a43ef4174f9338b807d5587632f281be40b3b Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 20 七月 2024 17:37:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/MatDto.java |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 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..2d90d5c 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.WrkDetl;
 import lombok.Data;
 
 /**
@@ -8,14 +9,31 @@
 @Data
 public class MatDto {
 
-    // 鐗╂枡缂栧彿
+    // 鐗╂枡缂栧彿  瑙勬牸
     private String matNo;
+    private String matnr;
 
-    // 鐗╂枡鍚嶇О
+    // 鐗╂枡鍚嶇О  瑙勬牸
     private String maknx;
+
+    //瑙勬牸
+    private String specs;
+
+    //绠卞彿
+    private String batch;
+
+    //鎵规
+    private String model;
+
+    //鍗峰彿
+//    private String juanNo;
+    private String price;
+    private String orderNo;
 
     // 鐗╂枡鏁伴噺
     private Double count;
+    private Double weight;
+    private Double volume;
 
     public MatDto() {
     }
@@ -25,4 +43,29 @@
         this.maknx = maknx;
         this.count = count;
     }
+
+    public MatDto(String matNo, String maknx, String specs, Double count) {
+        this.matNo = matNo;
+        this.maknx = maknx;
+        this.count = count;
+        this.specs = specs;
+    }
+    public MatDto(WrkDetl wrkDetl) {
+        try{
+            this.matNo = wrkDetl.getMatnr();
+            this.matnr = wrkDetl.getMatnr();
+            this.maknx = wrkDetl.getMaktx();
+            this.specs = wrkDetl.getSpecs();
+            this.batch = wrkDetl.getBatch();
+            this.model = wrkDetl.getModel();
+            this.price = wrkDetl.getPrice().toString();
+//        this.juanNo = wrkDetl.getSku();
+            this.count = wrkDetl.getAnfme();
+            this.weight = wrkDetl.getWeight();
+            this.volume = wrkDetl.getVolume();
+            this.orderNo = wrkDetl.getOrderNo();
+        } catch (Exception e){
+            System.out.println("寮傚父MatDto68");
+        }
+    }
 }

--
Gitblit v1.9.1