From 3160d2eb5f67ecb48b9c951b0ca974eade2040a5 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期四, 27 六月 2024 20:48:27 +0800
Subject: [PATCH] led显示屏修改
---
src/main/java/com/zy/common/model/MatDto.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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..6c20f86 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 lombok.Data;
/**
@@ -9,20 +10,50 @@
public class MatDto {
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
// 鐗╂枡鍚嶇О
private String maknx;
+ // 搴撲綅瑙勬牸
+ private String specs;
+
// 鐗╂枡鏁伴噺
private Double count;
+
+ // 搴撲綅鏁伴噺
+ private Double total;
+
+ // 鎵规
+ private String batch;
public MatDto() {
}
public MatDto(String matNo, String maknx, Double count) {
- this.matNo = matNo;
+ this.matnr = matNo;
this.maknx = maknx;
this.count = count;
}
+ public MatDto(String matNo, String maknx, Double count,String specs) {
+ this.specs = specs;
+ this.matnr = matNo;
+ this.maknx = maknx;
+ this.count = count;
+ }
+ public MatDto(String matNo, String maknx, Double count,String specs,String batch, String memo) {
+ this.batch = batch;
+ this.specs = specs;
+ this.matnr = matNo;
+ this.maknx = maknx;
+ this.count = count;
+ this.total = Cools.isEmpty(memo) ? 0 : Double.valueOf(memo);
+ }
+ public MatDto(String matNo, String maknx, Double count,Double total,String specs) {
+ this.specs = specs;
+ this.matnr = matNo;
+ this.maknx = maknx;
+ this.count = count;
+ this.total = total;
+ }
}
--
Gitblit v1.9.1