Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/CostAccountUnits.java

@@ -152,9 +152,11 @@ public class CostAccountUnits {
             Expense expense = expenseMap.get(projectId);
             Information info = informationMap.get(projectId);
 
-            Double settlementPrice = info.getSettlementPrice();//结算审定施工费
-            Double constructionCost = expense.getConstructionCost();//施工费合同折扣
-            Double construnctionPayable = settlementPrice*constructionCost/1.09;//施工费应付金额（不含税）
+//            Double settlementPrice = info.getSettlementPrice();//结算审定施工费
+//            Double constructionCost = expense.getConstructionCost();//施工费合同折扣
+//            Double construnctionPayable = settlementPrice*constructionCost/1.09;//施工费应付金额（不含税）
+
+            Double construnctionPayable = Double.parseDouble(info.getSuggestedAmount());
 
             credit.setConstructionFeePayable(DoubleUtil.round2(construnctionPayable));
 

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ErpInfo.java

@@ -254,7 +254,7 @@ public  class ErpInfo {
                     }else if(wbsDetail.contains("工程设计费")||wbsDetail.contains("设计文件评审费")){
                         erpCredit.setOtherDesignFee(DoubleUtil.add(erpCredit.getOtherDesignFee(),lineItemAmount));
                         erpCredit.setOtherTotalFee(DoubleUtil.add(erpCredit.getOtherTotalFee(),lineItemAmount));
-                    }else if(wbsDetail.contains("项目管理经费-会议费")){
+                    }else if(wbsDetail.contains("项目管理经费 - 会议费")){
                         erpCredit.setOtherTotalFee(DoubleUtil.add(erpCredit.getOtherTotalFee(),lineItemAmount));
                         erpCredit.setOtherLegalManage(DoubleUtil.add(erpCredit.getOtherLegalManage(),lineItemAmount));
                     }