From eb6ff2c2979b719435b53418a8c8afb6df4ff44b Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 28 Oct 2024 14:24:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=B6=E5=85=A5=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A8:=201:=E6=94=B9=E4=B8=BA=E6=89=8B=E5=8A=A8=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=20=E4=B8=8D=E5=86=8D=E7=94=B1=E5=8D=95=E4=BB=B7*?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=BF=9B=E8=A1=8C=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/model/ProjectBudgetIncomeDetailBase.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
index c1b6e8e..dfa3035 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
@@ -30,6 +30,12 @@ public class ProjectBudgetIncomeDetailBase {
 
     private String param;
 
+    public void setTotalTaxInclude(BigDecimal totalTaxInclude) {
+        this.totalTaxInclude = totalTaxInclude;
+    }
+
+    private BigDecimal totalTaxInclude;
+
     private String unit;
     private BigDecimal amount;
     private BigDecimal price;
@@ -130,10 +136,15 @@ public class ProjectBudgetIncomeDetailBase {
     }
 
     public BigDecimal getTotalTaxInclude(){
+        //  之前含税总金额为单价*价格  后续更改为手动数据  兼容之前版本数据
+        if (totalTaxInclude!=null){
+            return totalTaxInclude;
+        }
         if(null == price){
             return BigDecimal.ZERO;
         }
         return price.multiply(amount);
+        // return totalIn
     }
     public BigDecimal getTotalTaxExclude(){
         BigDecimal totalTaxInclude = getTotalTaxInclude();