From 58eaf5e73359f7164525d9c50f6e5bf82b247e32 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 24 四月 2025 09:10:58 +0800
Subject: [PATCH] 初步调试

---
 src/main/java/com/zy/common/model/MatDto.java |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 358e924..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;
 
 /**
@@ -10,7 +9,7 @@
 public class MatDto {
 
     // 鐗╂枡缂栧彿
-    private String matnr;
+    private String matNo;
 
     // 鐗╂枡鍚嶇О
     private String maknx;
@@ -27,6 +26,9 @@
     // 鐗╂枡鍚嶇О
     private String model;
 
+    // 绠辩爜
+    private String containerCode;
+
     // 鏉$爜
     private String batch;
 
@@ -36,30 +38,39 @@
     public MatDto() {
     }
 
-    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();
-    }
     public MatDto(String matNo, String maknx, Double count) {
-        this.matnr = matNo;
+        this.matNo = matNo;
         this.maknx = maknx;
         this.count = count;
     }
     public MatDto(String matNo, String maknx, Double count,String specs) {
         this.specs = specs;
-        this.matnr = matNo;
+        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.matnr = matNo;
+        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;
+    }
+    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