From 0143cc146be484ab3f41e15ec2fc4dab21ebc65f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 14:13:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/MatDto.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 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 adfd858..27442c7 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.OrderDetl;
 import lombok.Data;
 
 /**
@@ -27,6 +26,9 @@
     // 鐗╂枡鍚嶇О
     private String model;
 
+    // 绠辩爜
+    private String containerCode;
+
     // 鏉$爜
     private String batch;
 
@@ -36,14 +38,6 @@
     public MatDto() {
     }
 
-    public MatDto(OrderDetl orderDetl) {
-        this.matNo = orderDetl.getMatnr();
-        this.model = orderDetl.getModel();
-        this.batch = orderDetl.getBatch();
-        this.orderNo = orderDetl.getOrderNo();
-        this.count = orderDetl.getQty();
-        this.total = orderDetl.getAnfme();
-    }
     public MatDto(String matNo, String maknx, Double count) {
         this.matNo = matNo;
         this.maknx = maknx;
@@ -62,4 +56,21 @@
         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;
+    }
+    public MatDto(String matNo, String maknx, Double count,Double total,String specs,String containerCode,String orderNo) {
+        this.containerCode = containerCode;
+        this.specs = specs;
+        this.matNo = matNo;
+        this.maknx = maknx;
+        this.count = count;
+        this.total = total;
+        this.orderNo = orderNo;
+    }
 }

--
Gitblit v1.9.1