From 3677c6501ed94234f406d6444bab46e90824dac8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 二月 2025 09:58:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/model/MatDto.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e5b625b..bcd35af 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -1,5 +1,7 @@
package com.zy.common.model;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WrkDetl;
import lombok.Data;
/**
@@ -8,14 +10,37 @@
@Data
public class MatDto {
- // 鐗╂枡缂栧彿
+ // 鐗╂枡缂栧彿 瑙勬牸
private String matNo;
+ private String matnr;
- // 鐗╂枡鍚嶇О
+ // 鐗╂枡鍚嶇О 瑙勬牸
private String maknx;
+
+ //瑙勬牸
+ private String specs;
+
+ //绠卞彿
+ private String batch;
+
+ //鎵规
+ private String model;
+
+ //鍗峰彿
+// private String juanNo;
+ private String price;
+ private String orderNo;
+ private String cstmrName;
+ private String memo;
+ private Integer count1;
+ private Integer count2;
+ private Integer count3;
+ private Integer count4;
// 鐗╂枡鏁伴噺
private Double count;
+ private Double weight;
+ private Double volume;
public MatDto() {
}
@@ -25,4 +50,50 @@
this.maknx = maknx;
this.count = count;
}
+
+ public MatDto(String matNo, String maknx, String specs, Double count) {
+ this.matNo = matNo;
+ this.maknx = maknx;
+ this.count = count;
+ this.specs = specs;
+ }
+ public MatDto(WrkDetl wrkDetl) {
+ this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
+ this.maknx = wrkDetl.getMaktx();
+ this.specs = wrkDetl.getSpecs();
+ this.batch = wrkDetl.getBatch();
+ this.model = wrkDetl.getModel();
+ if (Cools.isEmpty(wrkDetl.getPrice())){
+ wrkDetl.setPrice(0.0);
+ }
+ this.price = wrkDetl.getPrice().toString();
+// this.juanNo = wrkDetl.getSku();
+ this.count = wrkDetl.getAnfme();
+ this.weight = wrkDetl.getWeight();
+ this.volume = wrkDetl.getVolume();
+ this.orderNo = wrkDetl.getOrderNo();
+ }
+
+ public MatDto(WrkDetl wrkDetl,Integer count1,Integer count2,Integer count3) {
+ this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
+ this.maknx = wrkDetl.getMaktx();
+ this.specs = wrkDetl.getSpecs();
+ this.batch = wrkDetl.getBatch();
+ this.model = wrkDetl.getModel();
+ if (Cools.isEmpty(wrkDetl.getPrice())){
+ wrkDetl.setPrice(0.0);
+ }
+ this.price = wrkDetl.getPrice().toString();
+// this.juanNo = wrkDetl.getSku();
+ this.count = wrkDetl.getAnfme();
+ this.weight = wrkDetl.getWeight();
+ this.volume = wrkDetl.getVolume();
+ this.orderNo = wrkDetl.getOrderNo();
+ this.cstmrName = wrkDetl.getColor();
+ this.count1 = count1;
+ this.count2 = count2;
+ this.count3 = count3;
+ }
}
--
Gitblit v1.9.1