移交资产—配电网资产一览表 安装费用不包含设备费用

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

@@ -485,12 +485,14 @@ public class ExportUtilCalculate {
         TransferOfPowerLine transferOfPower1 = null;//定义线路对象
         List<ErpCreditEquipment> erpCreditEquipmentList = null;//定义设备对象
         Double materialTotal = 0.0;//材料费总计
+        Double equipmentCost = 0.0;//设备费总计
         Double eqmValue = 0.0;//相同项目定义号合计:所有设备费
         Double standInFee=0.0;//摊入费用
 
         Double installEqm = 0.0;//特殊情况处理
         for (ErpCredit erpCredit:erpCredits){//循环erp账户项目
             materialTotal = getErpCreditMaterial(erpCredit);//得到材料费合计
+            equipmentCost = getEqmValueTotal(erpCredit.getErpCreditChild1s());//得到设备费合计
             erpCreditEquipmentList = erpCredit.getErpCreditChild1s();//获取设备集合
             installEqm = getEqmOneFlagValue(erpCreditEquipmentList);//得到设备台数都为0的值
 
@@ -519,7 +521,7 @@ public class ExportUtilCalculate {
                 transferOfPower1.setPowerBuildFee(decimalFormat.format(erpCredit.getConsBuildingFee()+materialTotal+installEqm));
             }
             if (null!=erpCredit.getConsInstallFee()&&erpCredit.getTenKvModel()!=null){//安装费
-                transferOfPower1.setPowerInstallFee(decimalFormat.format(erpCredit.getConsInstallFee()+materialTotal+installEqm));//添加安装费
+                transferOfPower1.setPowerInstallFee(decimalFormat.format(erpCredit.getConsInstallFee() + materialTotal + installEqm - equipmentCost));//添加安装费
             }else {
                 transferOfPower1.setPowerInstallFee("-");
             }