From 443e116f5f1684d6811948a2314f33d968799c61 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 05 六月 2025 20:49:37 +0800
Subject: [PATCH] *

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

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 0c9e224..79f64da 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -1,6 +1,5 @@
 package com.zy.common.model;
 
-import com.zy.asrs.entity.WrkDetl;
 import lombok.Data;
 
 /**
@@ -11,6 +10,7 @@
 
     // 鐗╂枡缂栧彿  瑙勬牸
     private String matNo;
+    private String matnr;
 
     // 鐗╂枡鍚嶇О  瑙勬牸
     private String maknx;
@@ -24,8 +24,15 @@
     //鎵规
     private String model;
 
+    //鍗峰彿
+//    private String juanNo;
+    private String price;
+    private String orderNo;
+
     // 鐗╂枡鏁伴噺
     private Double count;
+    private Double weight;
+    private Double volume;
 
     public MatDto() {
     }
@@ -40,12 +47,6 @@
         this.matNo = matNo;
         this.maknx = maknx;
         this.count = count;
-    }
-    public MatDto(WrkDetl wrkDetl) {
-        this.matNo = wrkDetl.getMatnr();
-        this.maknx = wrkDetl.getMaktx();
-        this.specs = wrkDetl.getMatnr();
-        this.batch = wrkDetl.getBatch();
-        this.count = wrkDetl.getAnfme();
+        this.specs = specs;
     }
 }

--
Gitblit v1.9.1