From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 40b0dae..39178ce 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -16,6 +16,20 @@
private String supplier;
private String memo;
+ //渚涘簲鍟�
+ private String vendor;
+ //鏉ユ簮
+ private String source;
+
+ public String getVendor(){return vendor;}
+
+ public void setVendor(String vendor){this.vendor=vendor;}
+
+ public String getSource() { return source; }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
public String getMemo() {
return memo;
@@ -25,25 +39,38 @@
this.memo = memo;
}
- public MatCodeCountDto() {
- }
+
public MatCodeCountDto(String matNo, Double count) {
this.matNo = matNo;
this.count = count;
}
- public MatCodeCountDto(String matNo, String supplier, Double count, String memo) {
+ public MatCodeCountDto(String matNo, String supplier, Double count, String memo,String source, String vendor) {
this.matNo = matNo;
this.count = count;
this.supplier = supplier;
this.memo = memo;
+ this.source = source;
+ this.vendor= vendor;
}
- public MatCodeCountDto(String matNo, String supplier, Double count) {
+ public MatCodeCountDto(String matNo, String supplier, Double count,String source, String vendor) {
this.matNo = matNo;
this.supplier = supplier;
this.count = count;
+ this.source = source;
+ this.vendor= vendor;
+ }
+
+ public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count,String source, String vendor) {
+ this.matNo = matNo;
+ this.count = count;
+ this.billNo = billNo;
+ this.supplier = supplier;
+ this.seqNo = seqNo;
+ this.source = source;
+ this.vendor= vendor;
}
public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count) {
@@ -53,8 +80,6 @@
this.supplier = supplier;
this.seqNo = seqNo;
}
-
-
public String getBillNo() { return billNo; }
public void setBillNo(String billNo) { this.billNo = billNo; }
--
Gitblit v1.9.1