From c25ccc2181c8d47936cf86443359e783eedeb018 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 15:19:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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..1944e44 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,14 @@
private String model;
//鍗峰彿
- private String juanNo;
+// private String juanNo;
+ private String price;
+ private String orderNo;
// 鐗╂枡鏁伴噺
private Double count;
+ private Double weight;
+ private Double volume;
public MatDto() {
}
@@ -46,11 +52,21 @@
this.specs = specs;
}
public MatDto(WrkDetl wrkDetl) {
- this.matNo = wrkDetl.getMatnr();
- this.maknx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getMatnr();
- this.batch = wrkDetl.getBatch();
- this.juanNo = wrkDetl.getSku();
- this.count = wrkDetl.getAnfme();
+ try{
+ this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
+ this.maknx = wrkDetl.getMaktx();
+ this.specs = wrkDetl.getSpecs();
+ this.batch = wrkDetl.getBatch();
+ this.model = wrkDetl.getModel();
+ this.price = Cools.isEmpty(wrkDetl.getPrice())? "":wrkDetl.getPrice().toString();
+// this.juanNo = wrkDetl.getSku();
+ this.count = wrkDetl.getAnfme();
+ this.weight = wrkDetl.getWeight();
+ this.volume = wrkDetl.getVolume();
+ this.orderNo = wrkDetl.getOrderNo();
+ } catch (Exception e){
+ System.out.println("寮傚父MatDto68");
+ }
}
}
--
Gitblit v1.9.1