From fe0b22ed3a56a53f0d9ccd95e09d009634d34b65 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期日, 13 七月 2025 16:05:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/model/LocDto.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 0677895..e10d679 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,8 @@
package com.zy.common.model;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.common.entity.OrderGiftProofreadingExcel;
import lombok.Data;
import java.util.List;
@@ -30,9 +32,15 @@
private String zpallet;
private String orderNo;
+ private String memo;
+
+ private String origin;
private Double anfme;
private Double count;
+ private Double weight;
+ private Double volume;
+ private Double price;
private boolean lack = false;
@@ -42,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) {
@@ -87,6 +107,25 @@
this.zpallet = zpallet;
}
+ public LocDto(LocDetl locDetl) {
+ this.locNo = locDetl.getLocNo();
+ this.matnr = locDetl.getMatnr();
+ this.maktx = locDetl.getMaktx();
+ this.batch = locDetl.getBatch();
+ this.orderNo = locDetl.getOrderNo();
+ this.anfme = locDetl.getAnfme();
+ this.count = locDetl.getAnfme();
+ this.model = locDetl.getModel();
+ this.specs = locDetl.getSpecs();
+ this.brand = locDetl.getBrand();
+ this.zpallet = locDetl.getZpallet();
+ this.weight = locDetl.getWeight();
+ this.volume = locDetl.getVolume();
+ this.price = locDetl.getPrice();
+ this.origin = locDetl.getOrigin();
+ this.memo = locDetl.getMemo();
+ }
+
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
--
Gitblit v1.9.1