feat 收入明细表:

1:改为手动输入 不再由单价*数量进行计算
dev_1.0.0
chenhao 2024-10-28 14:24:16 +08:00
parent c8169c5093
commit eb6ff2c297
1 changed files with 11 additions and 0 deletions

View File

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