From 1ddefcdadd90f100df509369ea520bebd6d206ce Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 七月 2025 09:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzglwcs' into tzglwcs
---
src/main/java/com/zy/common/model/MatDto.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e7ac3ba..45f3530 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -19,6 +19,7 @@
private String specs;
private String temp1;
+ private String temp2;
private String outOrderNo;
private String orderNo;
private String unit;
@@ -38,9 +39,11 @@
private Double total;
+ private String factArea;
+
public MatDto() {
}
- public MatDto(String matnr, String maknx, String batch, String specs,String OrderNo,String outOrderNo,String unit,Double weight,String objectName,Double length,String temp1,String proType,Double count, Double total){
+ public MatDto(String matnr, String maknx, String batch, String specs,String OrderNo,String outOrderNo,String unit,Double weight,String objectName,Double length,String temp1,String proType,Double count,String temp2,String factArea, Double total){
this.matnr = matnr;
this.maknx = maknx;
this.batch = batch;
@@ -54,6 +57,25 @@
this.temp1 = temp1;
this.proType = proType;
this.count = count;
+ this.temp2 = temp2;
+ this.factArea = factArea;
+ this.total = total;
+ }
+ public MatDto(String matnr, String maknx, String batch, String specs,String OrderNo,String outOrderNo,String unit,Double weight,String objectName,Double length,String temp1,String proType,Double count,String temp2, Double total){
+ this.matnr = matnr;
+ this.maknx = maknx;
+ this.batch = batch;
+ this.specs = specs;
+ this.orderNo = OrderNo;
+ this.outOrderNo = outOrderNo;
+ this.unit = unit;
+ this.weight = weight;
+ this.objectName = objectName;
+ this.length = length;
+ this.temp1 = temp1;
+ this.proType = proType;
+ this.count = count;
+ this.temp2 = temp2;
this.total = total;
}
public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
--
Gitblit v1.9.1