From ebe021c1038f16cadb24337aa8dcf08f33b93d6c Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 18 七月 2025 16:42:29 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/model/MatDto.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index f8e26dc..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,6 @@
package com.zy.common.model;
+import com.core.common.Cools;
import com.zy.asrs.entity.WrkDetl;
import lombok.Data;
@@ -11,6 +12,7 @@
// 鐗╂枡缂栧彿 瑙勬牸
private String matNo;
+ private String matnr;
// 鐗╂枡鍚嶇О 瑙勬牸
private String maknx;
@@ -25,10 +27,20 @@
private String model;
//鍗峰彿
- private String juanNo;
+// 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() {
}
@@ -47,10 +59,41 @@
}
public MatDto(WrkDetl wrkDetl) {
this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
this.maknx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getMatnr();
+ this.specs = wrkDetl.getSpecs();
this.batch = wrkDetl.getBatch();
- this.juanNo = wrkDetl.getSku();
+ 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