From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/LocDto.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index de1a694..e10d679 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -2,6 +2,7 @@
 
 import com.core.common.Cools;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.common.entity.OrderGiftProofreadingExcel;
 import lombok.Data;
 
 import java.util.List;
@@ -31,6 +32,7 @@
     private String zpallet;
 
     private String orderNo;
+    private String memo;
 
     private String origin;
 
@@ -48,6 +50,18 @@
     private Integer tkType;
 
     public LocDto() {
+    }
+
+    public LocDto(OrderGiftProofreadingExcel excel) {
+        this.matnr = excel.getMatnr();
+        this.model = excel.getModel();
+        this.orderNo = excel.getOrderNo();
+        this.batch = excel.getBatch();
+        this.memo = excel.getMemo();
+        this.weight = excel.getWeight();
+        this.volume = excel.getVolume();
+        this.price = excel.getPrice();
+        this.specs = excel.getSpecs();
     }
 
     public LocDto(String locNo, String matnr, String batch, Double anfme) {
@@ -109,6 +123,7 @@
         this.volume = locDetl.getVolume();
         this.price = locDetl.getPrice();
         this.origin = locDetl.getOrigin();
+        this.memo = locDetl.getMemo();
     }
 
     public String getTitle() {

--
Gitblit v1.9.1