From f95a3c836f06078f41389051a9d1c01969a925cb Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 20 三月 2026 11:28:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shhtgcwcs' into shhtgcwcs
---
src/main/java/com/zy/common/model/MatDto.java | 18 +++++++++++++++---
1 files changed, 15 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 da13eca..7541d4f 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -20,7 +20,7 @@
private String specs;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
// 搴撲綅鏁伴噺
private Double total;
@@ -46,15 +46,24 @@
//寮�绁ㄥ鎴峰悕绉�
private String kpCstmrName;
+ //鍗曞彿
+ private String orderNo;
+
+ //鎵瑰彿
+ private String batch;
+
+ // 搴撲綅缂栧彿
+ private String locNo;
+
public MatDto() {
}
- public MatDto(String matNo, String maktx, Double count, Double weight, Double total, Double totalWeight, String specs, String sku, String barcode, String model, String supp, String kpCstmrName) {
+ public MatDto(String matNo, String maktx, Double anfme, Double weight, Double total, Double totalWeight, String specs, String sku, String barcode, String model, String supp, String kpCstmrName, String orderNo, String batch, String locNo) {
this.matnr = matNo;
this.maktx = maktx;
this.maknx = maktx;
this.specs = specs;
- this.count = count;
+ this.anfme = anfme;
this.weight = weight;
this.total = total;
this.totalWeight = totalWeight;
@@ -63,5 +72,8 @@
this.model = model;
this.supp = supp;
this.kpCstmrName = kpCstmrName;
+ this.orderNo = orderNo;
+ this.batch = batch;
+ this.locNo = locNo;
}
}
--
Gitblit v1.9.1