自动结算书生成顺序修改，一览表新增《抵扣增值税》|《实际含税投资合计》

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpCredit.java

@@ -38,6 +38,7 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     private String supplierName;//供应商名称
     private String cableTube;//电缆管信息
     private String status;//状态
+    private Double listDeduction; //一览表抵扣增值税
     private Double deduction; //抵扣增值税
     private List<ErpCreditEquipment> erpCreditChild1s = new ArrayList<ErpCreditEquipment>();//设备列表
     private List<ErpCreditMaterial> erpCreditChild2s = new ArrayList<ErpCreditMaterial>();//材料列表
@@ -125,6 +126,14 @@ public class ErpCredit extends DataEntity<ErpCredit>{
         this.status = status;
     }
 
+    public Double getListDeduction() {
+        return listDeduction;
+    }
+
+    public void setListDeduction(Double listDeduction) {
+        this.listDeduction = listDeduction;
+    }
+
     public Double getDeduction() {
         return deduction;
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/Schedule.java

@@ -18,6 +18,8 @@ public class Schedule {
     private String actualTotalFee;//实际合计
     private String addSubtractionLines;//增加额
     private String addSubtractionRate;//增加率
+    private String listDeduction;//一览表抵扣增值税
+
 
     @Override
     public String toString() {
@@ -150,4 +152,12 @@ public class Schedule {
     public void setAddSubtractionRate(String addSubtractionRate) {
         this.addSubtractionRate = addSubtractionRate;
     }
+
+    public String getListDeduction() {
+        return listDeduction;
+    }
+
+    public void setListDeduction(String listDeduction) {
+        this.listDeduction = listDeduction;
+    }
 }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -257,14 +257,14 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
             sheetOverView =workbook.getSheetAt(0);//概述表
             sheetView = workbook.getSheetAt(1);//定义一览表
             sheetOtherFee = workbook.getSheetAt(2);//其他费用表
-            sheetAssetsTotal = workbook.getSheetAt(3);//移交生产总值
-            sheetLine1=workbook.getSheetAt(4);//线路1
-            sheetEquip=workbook.getSheetAt(5);//设备1
-            sheetEquipMaterial=workbook.getSheetAt(6);//设备材料清单表
-            sheetSettlement=workbook.getSheetAt(7);//结算表
-            sheetLine2=workbook.getSheetAt(9);//线路2
-            sheetEquip2=workbook.getSheetAt(10);//设备2
-            newForm=workbook.getSheetAt(11);//新表
+            sheetAssetsTotal = workbook.getSheetAt(4);//移交生产总值
+            sheetLine1=workbook.getSheetAt(7);//线路1
+            sheetEquip=workbook.getSheetAt(8);//设备1
+            sheetEquipMaterial=workbook.getSheetAt(9);//设备材料清单表
+            sheetSettlement=workbook.getSheetAt(10);//结算表
+            sheetLine2=workbook.getSheetAt(5);//线路2
+            sheetEquip2=workbook.getSheetAt(6);//设备2
+            newForm=workbook.getSheetAt(3);//新表
         } catch (Exception e1) {
             e1.printStackTrace();
         }

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

@@ -224,6 +224,9 @@ public  class ErpInfo {
                 erpCredit.setTransferAssets(DoubleUtil.add(erpCredit.getTransferAssets(),lineItemAmount));
             }
 
+            if (subjectName.contains("工程成本-")||subjectName.contains("项目建设成本-成本")) {
+                erpCredit.setListDeduction(DoubleUtil.add(erpCredit.getListDeduction(), inputTax));
+            }
 
             if(materialDetail.isEmpty()){
                 //施工费合计，明细账判断条件：物料描述为空且科目名称包含“工程成本-安装工程支出”  或 物料描述为空且科目名称包含“项目建设成本-成本”且wbs编码包括“10kV（20kV）配电装置”

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

@@ -154,10 +154,38 @@ public class ExportUtil {
                 cell.setCellValue(subtract.toString());
                 cell.setCellStyle(cellStyle);
                 if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
+
+
                 if (row.getCell(13)==null){
                     cell = row.createCell(13);
                 }else {
-                    cell=row.getCell(13);
+                    cell = row.getCell(13);
+                }
+                String listDeduction = schedule.getListDeduction();
+                cell.setCellValue(listDeduction);
+                cell.setCellStyle(cellStyle);
+                if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
+
+                BigDecimal allDecimal = new BigDecimal("0.0");
+                if (null != listDeduction && !"".equals(listDeduction)) {
+                    allDecimal = new BigDecimal(listDeduction);
+                }
+                BigDecimal add = allDecimal.add(subtract);
+                if (row.getCell(14)==null){
+                    cell = row.createCell(14);
+                }else {
+                    cell = row.getCell(14);
+                }
+                cell.setCellValue(add.toString());
+                cell.setCellStyle(cellStyle);
+                if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
+
+
+
+                if (row.getCell(15)==null){
+                    cell = row.createCell(15);
+                }else {
+                    cell=row.getCell(15);
                 }
                 String addSubtractionLines = schedule.getAddSubtractionLines();
                 if (null == addSubtractionLines || "".equals(addSubtractionLines)) {
@@ -168,10 +196,11 @@ public class ExportUtil {
                 cell.setCellValue(decimal.toString());
                 cell.setCellStyle(cellStyle);
                 if (i==scheduleList.size()-1){ cell.setCellStyle(cellStyleFont); }
-                if (row.getCell(14)==null){
-                    cell = row.createCell(14);
+
+                if (row.getCell(16)==null){
+                    cell = row.createCell(16);
                 }else {
-                    cell = row.getCell(14);
+                    cell = row.getCell(16);
                 }
                 cell.setCellValue(schedule.getAddSubtractionRate());
                 cell.setCellStyle(cellStyle);

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

@@ -49,6 +49,7 @@ public class ExportUtilCalculate {
         Double actualTotalFeeAll=0.0;//实际合计
         Double addSubtractionLinesAll=0.0;//增加额
         Double addSubtractionRateAll=0.0;//增加率
+        Double listDeduction = 0.0;//一览表抵扣增值税
         Schedule scheduletotal = new Schedule();
         List<Schedule> schedules = new ArrayList<Schedule>();
         Schedule schedule = null;
@@ -108,6 +109,10 @@ public class ExportUtilCalculate {
                 addSubtractionRateAll+=Double.parseDouble(s.getAddSubtractionRate());
                 scheduletotal.setAddSubtractionRate(decimalFormat.format(addSubtractionRateAll));
             }
+            if (null!=s.getListDeduction()) {
+                listDeduction += Double.parseDouble(s.getListDeduction());
+                scheduletotal.setListDeduction(decimalFormat.format(listDeduction));
+            }
         }
         scheduletotal.setItemName(itemNameAll);
         schedules.add(scheduletotal);
@@ -138,6 +143,9 @@ public class ExportUtilCalculate {
         //计算增减率
         addSubtractionRate1 = addSubtractionLines/Double.parseDouble(schedule.getBudgetTotalFee())*100;
         schedule.setAddSubtractionRate(decimalFormat.format(addSubtractionRate1));
+        if (null != erpCredit.getListDeduction()) {
+            schedule.setListDeduction(decimalFormat.format(erpCredit.getListDeduction()));
+        }
         return scheduleActual;
     }
     //获取：一览表 预算价值