From 46d68076bfa7b706549e0420dfe09314024e3696 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 21:02:39 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/common/model/MatDto.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 7c19f47..6c3a90b 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -1,5 +1,6 @@
package com.zy.common.model;
+import com.zy.asrs.entity.OrderDetl;
import lombok.Data;
/**
@@ -9,23 +10,76 @@
public class MatDto {
// 鐗╂枡缂栧彿
- private String matnr;
+ private String matNo;
// 鐗╂枡鍚嶇О
private String maknx;
- private String batch;
+ // 搴撲綅瑙勬牸
+ private String specs;
// 鐗╂枡鏁伴噺
private Double count;
+ // 搴撲綅鏁伴噺
+ private Double total;
+
+ // 鐗╂枡鍚嶇О
+ private String model;
+
+ // 绠辩爜
+ private String containerCode;
+
+ // 鏉$爜
+ private String batch;
+
+ // 璁㈠崟缂栧彿
+ private String orderNo;
+
public MatDto() {
}
- public MatDto(String matnr, String maknx, String batch, Double count) {
- this.matnr = matnr;
+ public MatDto(OrderDetl orderDetl) {
+ this.matNo = 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.matNo = matNo;
this.maknx = maknx;
- this.batch = batch;
this.count = count;
}
+ public MatDto(String matNo, String maknx, Double count,String specs) {
+ this.specs = specs;
+ 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.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