20191126

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/mapper/xml/ErpCreditMaterialMapper.xml

@@ -76,6 +76,8 @@
 			erp_credit_id,
 			eqm_material_details,
 			mtl_booked_fee,
+			mtl_unit,
+			mtl_numbers,
 			mtl_supplier_name
 		) VALUES (
 			#{id},
@@ -88,6 +90,8 @@
 			#{erpCredit.id},
 			#{eqmMaterialDetails2},
 			#{mtlBookedFee2},
+			#{mtlUnit},
+			#{mtlNumbers},
 			#{mtlSupplierName}
 		)
 	</insert>

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

@@ -8,6 +8,7 @@ import groovy.util.IFileNameFinder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -157,7 +158,6 @@ public  class ErpInfo {
             if (flag){//如果为true
                 //施工费合计 赋值为安装费（有 设备费入账金额 或者 材料费入账金额）
                 erpCredit.setConsInstallFee(erpCredit.getConsTotalFee());
-                erpCredit.setCableTube("");
             }else {
                 //施工费合计 赋值为 建筑费（无 设备费入账金额 以及 材料费入账金额）
                 erpCredit.setConsBuildingFee(erpCredit.getConsTotalFee());
@@ -219,7 +219,9 @@ public  class ErpInfo {
                 }
             }
         }
-        return erpCredits;
+        List<ErpCredit> otherManageFee = getOtherManageFee(erpCredits);//计算其他费用法人管理费
+
+        return otherManageFee;
     }
 
     /**
@@ -531,6 +533,39 @@ public  class ErpInfo {
         }
         return erpCredit;
     }
+
+    /**
+     * 法人管理费计算
+     * @param erpCredits
+     * @return
+     */
+    public static List<ErpCredit> getOtherManageFee(List<ErpCredit> erpCredits){
+        Double total=0.0;//其他：监理费
+        Double otherLegalManage = 0.0;//法人管理费
+        for (ErpCredit erpCredit1:erpCredits){
+            total = 0.0;
+            if (null!=erpCredit1.getOtherSupervisorFee()){
+                total  += erpCredit1.getOtherSupervisorFee();
+            }
+            if (null!=erpCredit1.getOtherDesignFee()){
+                total += erpCredit1.getOtherDesignFee();
+            }
+            if (null!=erpCredit1.getOtherBeWorkFee()){
+                total += erpCredit1.getOtherBeWorkFee();
+            }
+            if (null!=erpCredit1.getConsBuildingFee()){
+                total += erpCredit1.getOtherBuildLoan();
+            }
+            if (null!=erpCredit1.getOtherLineDamages()){
+                total += erpCredit1.getOtherLineDamages();
+            }
+            if (null!=erpCredit1.getOtherLegalManage()){
+                otherLegalManage = erpCredit1.getOtherLegalManage();
+            }
+            erpCredit1.setOtherLegalManage(otherLegalManage-total);
+        }
+        return erpCredits;
+    }
     /**
      * 获取设备的list集合
      * @param list 导入的表格 bean对象

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

@@ -17,7 +17,7 @@ public class ExportUtil1 {
     public static String POWER_DEPARTMENT="配电检修工区";
     public static String POWER_BDZ="变压器";
     public static String POWER_BOXBDZ="箱式变电站";
-    public static String POWER_HGW="环网柜";
+    public static String POWER_HGW="环网";
     public static String POWER_KGG="高压开关柜";
     public static String POWER_ZYXL="中压线路";
     public static String POWER_BDZCOUNT="160200001";
@@ -175,7 +175,8 @@ public class ExportUtil1 {
         schedule.setItemId(erpCredit.getItemId());//得到项目定义编号
         schedule.setItemName(erpCredit.getItemName());//得到项目名称
         netAmount = getErpCreditMaterial(erpCredit);//得到材料费
-        if (null!=erpCredit.getConsInstallFee()&&erpCredit.getTenKvModel()!=null){
+        //设备费&&erpCredit.getTenKvModel()!=null
+        if (null!=erpCredit.getConsInstallFee()){
             schedule.setActualIntallProject(decimalFormat.format(netAmount+erpCredit.getConsInstallFee()));
             actualTotalFee=actualTotalFee+netAmount+erpCredit.getConsInstallFee();//合计金额累加
         }
@@ -195,15 +196,17 @@ public class ExportUtil1 {
                 }
             }
             if (flag){
-                if (null!=erpCredit.getConsInstallFee()){
-                   if (null==erpCredit.getTenKvModel()){
-                       schedule.setActualEquipmentValue(decimalFormat.format(netAmount+erpCredit.getConsInstallFee()));//实际设备价值
-                       actualTotalFee+=netAmount+erpCredit.getConsInstallFee();//实际费用累加
-                   }else {
-                       schedule.setActualEquipmentValue(decimalFormat.format(netAmount));//实际设备价值
-                       actualTotalFee+=netAmount;//实际费用累加
-                   }
-                }
+                schedule.setActualEquipmentValue(decimalFormat.format(netAmount));//实际设备价值
+                actualTotalFee+=netAmount;//实际费用累加
+//                if (null!=erpCredit.getConsInstallFee()){
+//                   if (null==erpCredit.getTenKvModel()){
+//                       schedule.setActualEquipmentValue(decimalFormat.format(netAmount+erpCredit.getConsInstallFee()));//实际设备价值
+//                       actualTotalFee+=netAmount+erpCredit.getConsInstallFee();//实际费用累加
+//                   }else {
+//                       schedule.setActualEquipmentValue(decimalFormat.format(netAmount));//实际设备价值
+//                       actualTotalFee+=netAmount;//实际费用累加
+//                   }
+//                }
             }
             flag=false;//数据清0
             netAmount=0.0;
@@ -420,7 +423,7 @@ public class ExportUtil1 {
                             materialEquipment.setMeUnitPrice(decimalFormat.format(erpCreditChild2.getMtlBookedFee2()));
                         }
                     }else {
-                        materialEquipment.setMeUnit("0");
+                        materialEquipment.setMeUnit("");
                     }
                     materialEquipments.add(materialEquipment);
                 }
@@ -495,6 +498,7 @@ public class ExportUtil1 {
             if (null!=erpCredit.getTenKvModel()){//10kv电缆架空导线型号
                 transferOfPower1.setPowerTenKvCableType(erpCredit.getTenKvModel());
             }
+            //添加保护管信息
             if (null!=erpCredit.getCableTube()){
                 transferOfPower1.setPowerTenKvCableType(erpCredit.getCableTube());
             }

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

@@ -438,7 +438,7 @@ public class ExportUtil2 {
                 }else {
                     cell = row.getCell(0);
                 }
-                cell.setCellValue(materialEquipment.getId());//项目定义编号
+                cell.setCellValue(i+1);//项目定义编号
                 cell.setCellStyle(cellStyle);//添加边框
                 //第二行
                 if (row.getCell(1)==null){