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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 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 3cf862a..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;
@@ -12,6 +14,7 @@
public class LocDto {
private String locNo;
+ private Long orderDetlId;
private String matnr;
@@ -29,17 +32,36 @@
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;
private List<Integer> staNos;
private Integer staNo;
+ 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) {
@@ -85,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 + "锛�";
}
@@ -101,4 +142,12 @@
this.count=anfme;
}
+ public String getTkType$(){
+ if (null == this.tkType) return "姝ｅ父";
+ if (this.tkType == 1) {
+ return "閫�搴�";
+ }
+ return "姝ｅ父";
+ }
+
}
--
Gitblit v1.9.1