diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
index 5a439577..ca971bfd 100644
--- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
@@ -24,4 +24,10 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
private String orderRef1;
private String bu;
private String departmentDesc;
+
+ private String quoterName;
+
+ private String tpName;
+
+ private String purchaserName;
}
diff --git a/src/main/java/com/spring/modules/Tooling/data/ToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/ToolApplyHeaderData.java
index a8057b03..1971db2d 100644
--- a/src/main/java/com/spring/modules/Tooling/data/ToolApplyHeaderData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/ToolApplyHeaderData.java
@@ -17,4 +17,11 @@ public class ToolApplyHeaderData extends PlmToolApplyHeader {
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date endDate;
+
+
+ private String quoterName;
+
+ private String tpName;
+
+ private String purchaserName;
}
diff --git a/src/main/java/com/spring/modules/Tooling/entity/PlmToolApplyHeader.java b/src/main/java/com/spring/modules/Tooling/entity/PlmToolApplyHeader.java
index c7c097f5..d7851a83 100644
--- a/src/main/java/com/spring/modules/Tooling/entity/PlmToolApplyHeader.java
+++ b/src/main/java/com/spring/modules/Tooling/entity/PlmToolApplyHeader.java
@@ -101,6 +101,12 @@ public class PlmToolApplyHeader extends QueryPage {
*/
private String supplierName;
+ private String quoter;
+
+ private String tp;
+
+ private String purchaser;
+
public String getSite() {
return site;
}
@@ -252,5 +258,29 @@ public class PlmToolApplyHeader extends QueryPage {
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
+
+ public String getQuoter() {
+ return quoter;
+ }
+
+ public void setQuoter(String quoter) {
+ this.quoter = quoter;
+ }
+
+ public String getTp() {
+ return tp;
+ }
+
+ public void setTp(String tp) {
+ this.tp = tp;
+ }
+
+ public String getPurchaser() {
+ return purchaser;
+ }
+
+ public void setPurchaser(String purchaser) {
+ this.purchaser = purchaser;
+ }
}
diff --git a/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyHeader.java b/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyHeader.java
index 342999ad..751ef612 100644
--- a/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyHeader.java
+++ b/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyHeader.java
@@ -114,6 +114,12 @@ public class PlmProjectToolApplyHeader extends QueryPage {
private Integer rejectStepId;
+ private String quoter;
+
+ private String tp;
+
+ private String purchaser;
+
public String getRejectFlag() {
return rejectFlag;
}
@@ -297,5 +303,29 @@ public class PlmProjectToolApplyHeader extends QueryPage {
public void setDepartment(String department) {
this.department = department;
}
+
+ public String getQuoter() {
+ return quoter;
+ }
+
+ public void setQuoter(String quoter) {
+ this.quoter = quoter;
+ }
+
+ public String getTp() {
+ return tp;
+ }
+
+ public void setTp(String tp) {
+ this.tp = tp;
+ }
+
+ public String getPurchaser() {
+ return purchaser;
+ }
+
+ public void setPurchaser(String purchaser) {
+ this.purchaser = purchaser;
+ }
}
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index 55c15b54..4d4dcbaf 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -51,8 +51,11 @@
@@ -77,6 +80,7 @@