From 6f86c183eb3aee77526da0f8342aa5eaf8adb1dd Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 14 Oct 2024 16:31:26 +0800
Subject: [PATCH] 1127

---
 .../modules/Tooling/data/ProjectToolApplyDaTa.java    |  2 ++
 .../service/impl/ProjectToolingApplyServiceImpl.java  |  1 +
 .../base/entity/PlmProjectToolApplyHeader.java        | 10 +++++++++-
 .../mapper/Tooling/ProjectToolingApplyMapper.xml      | 11 ++++++-----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/ProjectToolApplyDaTa.java b/src/main/java/com/spring/modules/Tooling/data/ProjectToolApplyDaTa.java
index 7d7faad8..d18aef0e 100644
--- a/src/main/java/com/spring/modules/Tooling/data/ProjectToolApplyDaTa.java
+++ b/src/main/java/com/spring/modules/Tooling/data/ProjectToolApplyDaTa.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -16,6 +17,7 @@ public class ProjectToolApplyDaTa {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date applyDate;
     private Integer applySumQty;
+    private BigDecimal totalCost;
     private String applyReason;
     private String remark;
     private String createBy;
diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
index d1f61bd2..2c9d1cad 100644
--- a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
+++ b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
@@ -128,6 +128,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
         applyHeader.setRemark(inData.getRemark());
         applyHeader.setCreateBy(inData.getCreateBy());
         applyHeader.setCreateDate(new Date());
+        applyHeader.setTotalCost(inData.getTotalCost());
         applyHeader.setDepartment(inData.getDepartment());
         applyHeader.setTp(inData.getTp());
         applyHeader.setPurchaser(inData.getPurchaser());
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 751ef612..4a4ecf89 100644
--- a/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyHeader.java
+++ b/src/main/java/com/spring/modules/base/entity/PlmProjectToolApplyHeader.java
@@ -97,7 +97,7 @@ public class PlmProjectToolApplyHeader extends QueryPage {
      *
      */
     private BigDecimal allCost;
-
+    private BigDecimal totalCost;
     /**
      *
      */
@@ -327,5 +327,13 @@ public class PlmProjectToolApplyHeader extends QueryPage {
     public void setPurchaser(String purchaser) {
         this.purchaser = purchaser;
     }
+
+    public BigDecimal getTotalCost() {
+        return totalCost;
+    }
+
+    public void setTotalCost(BigDecimal totalCost) {
+        this.totalCost = totalCost;
+    }
 }
 
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index 317e6f4f..8dfb43c1 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -52,10 +52,10 @@
 
     <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,quoter,tp,purchaser)
+           create_by,create_date,department,quoter,tp,purchaser,totalCost)
            values
         (#{site},#{applyNo},#{applyBy},#{statusCode},#{status},#{applyDate},#{applySumQty},#{applyReason},#{remark},#{createBy},
-        #{createDate},#{department},#{quoter},#{tp},#{purchaser})
+        #{createDate},#{department},#{quoter},#{tp},#{purchaser},#{totalCost})
 
     </insert>
 
@@ -81,7 +81,7 @@
         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,step_id
-        ,reject_flag    ,reject_step_id
+        ,reject_flag    ,reject_step_id,totalCost
         FROM plm_project_tool_applyHeader
         <where>
 
@@ -180,12 +180,13 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
               remark = #{remark},
               tp=#{tp},
               quoter=#{quoter},
-              purchaser=#{purchaser}
+              purchaser=#{purchaser},
+              totalCost=#{totalCost,jdbcType=DECIMAL}
           where site = #{site} and apply_no = #{applyNo}
     </update>
 
 <update id="updateApplyDetail">
-      update plm_project_tool_applyDetail set applyQty=#{applyQty} where  site=#{site} and apply_no=#{applyNo} and seqNo=#{seqNo}
+      update plm_project_tool_applyDetail set applyQty=#{applyQty},standard_cost=#{standardCost} where  site=#{site} and apply_no=#{applyNo} and seqNo=#{seqNo}
 </update>
 
     <select id="getProjectPartToolDetail" resultType="PlmProjectToolApplyDetailData">