mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

应该取含税金额

master
xxssyyyyssxx 2021-12-02 18:14:42 +08:00
parent 6177d24e66
commit f86f6a9616
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -574,7 +574,7 @@ public class ProjectBudgetService {
BigDecimal saleIncome = new BigDecimal(0); BigDecimal saleIncome = new BigDecimal(0);
if(CollectionUtil.isNotEmpty(budgetIncomeDetail)){ if(CollectionUtil.isNotEmpty(budgetIncomeDetail)){
for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) { for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) {
saleIncome = saleIncome.add(projectBudgetIncomeDetail.getTotalTaxExclude()); saleIncome = saleIncome.add(projectBudgetIncomeDetail.getTotalTaxInclude());
} }
} }
return saleIncome; return saleIncome;
@ -595,7 +595,7 @@ public class ProjectBudgetService {
if(CollectionUtil.isNotEmpty(budgetCostDetail)){ if(CollectionUtil.isNotEmpty(budgetCostDetail)){
List<ProjectBudgetCostDetail> costDetailList = budgetCostDetail.stream().filter(b -> b.getType() != ProjectBudgetCostDetail.TYPE_DEVICE).collect(Collectors.toList()); List<ProjectBudgetCostDetail> costDetailList = budgetCostDetail.stream().filter(b -> b.getType() != ProjectBudgetCostDetail.TYPE_DEVICE).collect(Collectors.toList());
for (ProjectBudgetCostDetail projectBudgetCostDetail : costDetailList) { for (ProjectBudgetCostDetail projectBudgetCostDetail : costDetailList) {
engineerCost = engineerCost.add(projectBudgetCostDetail.getTotalTaxExclude()); engineerCost = engineerCost.add(projectBudgetCostDetail.getTotalTaxInclude());
} }
} }
return engineerCost; return engineerCost;
@ -605,7 +605,7 @@ public class ProjectBudgetService {
if(CollectionUtil.isNotEmpty(budgetCostDetail)){ if(CollectionUtil.isNotEmpty(budgetCostDetail)){
List<ProjectBudgetCostDetail> costDetailList = budgetCostDetail.stream().filter(b -> b.getType() == ProjectBudgetCostDetail.TYPE_DEVICE).collect(Collectors.toList()); List<ProjectBudgetCostDetail> costDetailList = budgetCostDetail.stream().filter(b -> b.getType() == ProjectBudgetCostDetail.TYPE_DEVICE).collect(Collectors.toList());
for (ProjectBudgetCostDetail projectBudgetCostDetail : costDetailList) { for (ProjectBudgetCostDetail projectBudgetCostDetail : costDetailList) {
deviceCost = deviceCost.add(projectBudgetCostDetail.getTotalTaxExclude()); deviceCost = deviceCost.add(projectBudgetCostDetail.getTotalTaxInclude());
} }
} }
return deviceCost; return deviceCost;

26
src/main/resources/static/assets/js/project_budget_plan.js
View File

@ -60,12 +60,12 @@ function verifyBudgetPlan(){
} }
var costPurchaseDeviceTaxExclude = inputVal("costPurchaseDeviceTaxExclude"); var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");
var costPurchaseBuildTaxExclude = inputVal("costPurchaseBuildTaxExclude"); var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude");
var costPurchaseServiceTaxExclude = inputVal("costPurchaseServiceTaxExclude"); var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude");
var costPurchaseOtherTaxExclude = inputVal("costPurchaseOtherTaxExclude"); var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude");
var costProjectManageTaxExclude = inputVal("costProjectManageTaxExclude"); var costProjectManageTaxInclude = inputVal("costProjectManageTaxInclude");
var incomeTotalTaxExclude = inputVal("incomeTotalTaxExclude"); var incomeTotalTaxInclude = inputVal("incomeTotalTaxInclude");
var input_total_device_cost_budget_plan = classVal("input-total-device-cost-budget-plan"); var input_total_device_cost_budget_plan = classVal("input-total-device-cost-budget-plan");
var input_total_engineer_cost_budget_plan = classVal("input-total-engineer-cost-budget-plan"); var input_total_engineer_cost_budget_plan = classVal("input-total-engineer-cost-budget-plan");
var input_total_project_manage_budget_plan = classVal("input-total-project-manage-cost-budget-plan"); var input_total_project_manage_budget_plan = classVal("input-total-project-manage-cost-budget-plan");
@ -75,21 +75,21 @@ function verifyBudgetPlan(){
//从采购成本明细中取“设备”大类下的总计---设备支出 //从采购成本明细中取“设备”大类下的总计---设备支出
if(costPurchaseDeviceTaxExclude != input_total_device_cost_budget_plan){ if(costPurchaseDeviceTaxInclude != input_total_device_cost_budget_plan){
return "采购成本明细中取“设备”大类下的总计["+costPurchaseDeviceTaxExclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等"; return "采购成本明细中取“设备”大类下的总计["+costPurchaseDeviceTaxInclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等";
} }
//从采购成本明细中取“服务+施工+其他”大类的总计---工程支出 //从采购成本明细中取“服务+施工+其他”大类的总计---工程支出
var t = f2(f2(costPurchaseBuildTaxExclude)+f2(costPurchaseServiceTaxExclude)+f2(costPurchaseOtherTaxExclude)); var t = f2(f2(costPurchaseBuildTaxInclude)+f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude));
if(t != f2(input_total_engineer_cost_budget_plan)){ if(t != f2(input_total_engineer_cost_budget_plan)){
return "采购成本明细中取“服务+施工+其他”大类的总计["+t+"]与工程支出["+input_total_engineer_cost_budget_plan+"]不等"; return "采购成本明细中取“服务+施工+其他”大类的总计["+t+"]与工程支出["+input_total_engineer_cost_budget_plan+"]不等";
} }
//从项目管理成本取总计金额--经营性开支 //从项目管理成本取总计金额--经营性开支
if(costProjectManageTaxExclude != input_total_project_manage_budget_plan){ if(costProjectManageTaxInclude != input_total_project_manage_budget_plan){
return "项目管理成本取总计金额["+costProjectManageTaxExclude+"]与经营性开支["+input_total_project_manage_budget_plan+"]不等"; return "项目管理成本取总计金额["+costProjectManageTaxInclude+"]与经营性开支["+input_total_project_manage_budget_plan+"]不等";
} }
//从“销售收入明细”中取合计--销售收款 //从“销售收入明细”中取合计--销售收款
if(incomeTotalTaxExclude != input_total_sale_income_budget_plan){ if(incomeTotalTaxInclude != input_total_sale_income_budget_plan){
return "销售收入明细金额["+incomeTotalTaxExclude+"]与销售收款["+input_total_sale_income_budget_plan+"]不等"; return "销售收入明细金额["+incomeTotalTaxInclude+"]与销售收款["+input_total_sale_income_budget_plan+"]不等";
} }
//保证金支出和收入一致 //保证金支出和收入一致
if(input_total_earnest_money_cost_budget_plan != input_total_earnest_money_income_budget_plan){ if(input_total_earnest_money_cost_budget_plan != input_total_earnest_money_income_budget_plan){