From dfdf98629fa109a18a76bcc00a63a812c4ecbcaa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:01:55 +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 33323bb..47a5cf2 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;
@@ -47,8 +48,21 @@
 
     private Integer staNo;
     private Integer tkType;
+    private Integer danger;
 
     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) {
@@ -111,6 +125,7 @@
         this.price = locDetl.getPrice();
         this.origin = locDetl.getOrigin();
         this.memo = locDetl.getMemo();
+        this.danger = locDetl.getDanger();
     }
 
     public String getTitle() {

--
Gitblit v1.9.1