From 3d0cb9f805f850f610b52dfadf24e1a65f621711 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sat, 12 Oct 2024 15:31:03 +0800
Subject: [PATCH] 1127

---
 .../data/PlmProjectToolApplyHeaderData.java   |  6 ++++
 .../Tooling/data/ToolApplyHeaderData.java     |  7 +++++
 .../Tooling/entity/PlmToolApplyHeader.java    | 30 +++++++++++++++++++
 .../entity/PlmProjectToolApplyHeader.java     | 30 +++++++++++++++++++
 .../Tooling/ProjectToolingApplyMapper.xml     |  9 ++++--
 5 files changed, 80 insertions(+), 2 deletions(-)

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 @@
     </select>
 
     <insert id="saveApplyHeader">
-           INSERT INTO plm_project_tool_applyHeader (site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,create_by,create_date,department) values
-        (#{site},#{applyNo},#{applyBy},#{statusCode},#{status},#{applyDate},#{applySumQty},#{applyReason},#{remark},#{createBy},#{createDate},#{department})
+           INSERT INTO plm_project_tool_applyHeader (site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,
+           create_by,create_date,department,quoter,tp,purchaser)
+           values
+        (#{site},#{applyNo},#{applyBy},#{statusCode},#{status},#{applyDate},#{applySumQty},#{applyReason},#{remark},#{createBy},
+        #{createDate},#{department},#{quoter},#{tp},#{purchaser})
 
     </insert>
 
@@ -77,6 +80,7 @@
     <select id="searchToolApplyHeader" resultType="PlmProjectToolApplyHeaderData">
         SELECT site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,create_by,create_date,update_by,
         update_date,prNo,remark1,poNo,allCost,remark2,supplierName,department,dbo.plm_get_dictDataLabel('tool_application_department',department,site) departmentDesc
+        ,tp,dbo.get_userDisPlay(tp) tpName   ,quoter,dbo.get_userDisPlay(quoter) quoterName   ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName
         FROM plm_project_tool_applyHeader
         <where>
 
@@ -145,6 +149,7 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
             step_id,
             reject_flag,
             reject_step_id
+            ,tp,dbo.get_userDisPlay(tp) tpName   ,quoter,dbo.get_userDisPlay(quoter) quoterName   ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName
             FROM plm_project_tool_applyHeader
             where site = #{site} and apply_no = #{applyNo}
     </select>