diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
index c3ef176a..0ac59f15 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
@@ -363,34 +363,6 @@ public class PoiOutPage {
         }
         rowNum = createTotalRow(sheet, rowNum, listRepair, totalCostRepair, headerStyle);
 
-        /**
-         * 报废费用明细
-         */
-        // 填充标题行
-        rowNum = createTitleRowStyleCost(sheet, rowNum, "报废费用明细", titleStyle, listScrap.size());
-        // 填充表头
-        rowNum = createHeaderRow(sheet, rowNum, listScrap, headerStyle);
-        // 填充数据行
-        if (resultScrap!= null &&!resultScrap.isEmpty()) {
-            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
-        } else {
-            // 如果没有数据，则仅显示表头
-//            rowNum++;
-//            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
-            HSSFRow row = sheet.createRow(rowNum++);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellStyle(headerStyle);
-            cell.setCellValue("暂无数据");
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)));
-            CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1));
-            // 设置边框样式
-            RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet);
-        }
-        rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
-
         /**
          * 丢失费用明细
          */
@@ -419,6 +391,34 @@ public class PoiOutPage {
         }
         rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle);
 
+        /**
+         * 报废费用明细
+         */
+        // 填充标题行
+        rowNum = createTitleRowStyleCost(sheet, rowNum, "报废费用明细", titleStyle, listScrap.size());
+        // 填充表头
+        rowNum = createHeaderRow(sheet, rowNum, listScrap, headerStyle);
+        // 填充数据行
+        if (resultScrap!= null &&!resultScrap.isEmpty()) {
+            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
+        } else {
+            // 如果没有数据，则仅显示表头
+//            rowNum++;
+//            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
+            HSSFRow row = sheet.createRow(rowNum++);
+            HSSFCell cell = row.createCell(0);
+            cell.setCellStyle(headerStyle);
+            cell.setCellValue("暂无数据");
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)));
+            CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1));
+            // 设置边框样式
+            RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet);
+        }
+        rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
+
         /**
          * 减免费用明细
          */
@@ -530,34 +530,6 @@ public class PoiOutPage {
         }
         rowNum = createTotalRow(sheet, rowNum, listRepair, totalCostRepair, headerStyle);
 
-        /**
-         * 报废费用明细
-         */
-        // 填充标题行
-        rowNum = createTitleRowStyleCost(sheet, rowNum, "报废费用明细", titleStyle, listScrap.size());
-        // 填充表头
-        rowNum = createHeaderRow(sheet, rowNum, listScrap, headerStyle);
-        // 填充数据行
-        if (resultScrap!= null &&!resultScrap.isEmpty()) {
-            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
-        } else {
-            // 如果没有数据，则仅显示表头
-//            rowNum++;
-//            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
-            HSSFRow row = sheet.createRow(rowNum++);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellStyle(headerStyle);
-            cell.setCellValue("暂无数据");
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)));
-            CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1));
-            // 设置边框样式
-            RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet);
-        }
-        rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
-
         /**
          * 丢失费用明细
          */
@@ -586,6 +558,34 @@ public class PoiOutPage {
         }
         rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle);
 
+        /**
+         * 报废费用明细
+         */
+        // 填充标题行
+        rowNum = createTitleRowStyleCost(sheet, rowNum, "报废费用明细", titleStyle, listScrap.size());
+        // 填充表头
+        rowNum = createHeaderRow(sheet, rowNum, listScrap, headerStyle);
+        // 填充数据行
+        if (resultScrap!= null &&!resultScrap.isEmpty()) {
+            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
+        } else {
+            // 如果没有数据，则仅显示表头
+//            rowNum++;
+//            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
+            HSSFRow row = sheet.createRow(rowNum++);
+            HSSFCell cell = row.createCell(0);
+            cell.setCellStyle(headerStyle);
+            cell.setCellValue("暂无数据");
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)));
+            CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1));
+            // 设置边框样式
+            RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet);
+        }
+        rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
+
         /**
          * 减免费用明细
          */
@@ -713,34 +713,6 @@ public class PoiOutPage {
         }
         rowNum = createTotalRow(sheet, rowNum, listRepair, totalCostRepair, headerStyle);
 
-        /**
-         * 报废费用明细
-         */
-        // 填充标题行
-        rowNum = createTitleRowStyleCost(sheet, rowNum, "报废费用明细", titleStyle, listScrap.size());
-        // 填充表头
-        rowNum = createHeaderRow(sheet, rowNum, listScrap, headerStyle);
-        // 填充数据行
-        if (resultScrap!= null &&!resultScrap.isEmpty()) {
-            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
-        } else {
-            // 如果没有数据，则仅显示表头
-//            rowNum++;
-//            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
-            HSSFRow row = sheet.createRow(rowNum++);
-            HSSFCell cell = row.createCell(0);
-            cell.setCellStyle(headerStyle);
-            cell.setCellValue("暂无数据");
-            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)));
-            CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1));
-            // 设置边框样式
-            RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet);
-            RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet);
-        }
-        rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
-
         /**
          * 丢失费用明细
          */
@@ -769,6 +741,34 @@ public class PoiOutPage {
         }
         rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle);
 
+        /**
+         * 报废费用明细
+         */
+        // 填充标题行
+        rowNum = createTitleRowStyleCost(sheet, rowNum, "报废费用明细", titleStyle, listScrap.size());
+        // 填充表头
+        rowNum = createHeaderRow(sheet, rowNum, listScrap, headerStyle);
+        // 填充数据行
+        if (resultScrap!= null &&!resultScrap.isEmpty()) {
+            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
+        } else {
+            // 如果没有数据，则仅显示表头
+//            rowNum++;
+//            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
+            HSSFRow row = sheet.createRow(rowNum++);
+            HSSFCell cell = row.createCell(0);
+            cell.setCellStyle(headerStyle);
+            cell.setCellValue("暂无数据");
+            sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)));
+            CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1));
+            // 设置边框样式
+            RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet);
+            RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet);
+        }
+        rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
+
         /**
          * 减免费用明细
          */
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
index 5313a8cd..d4d50b41 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
@@ -336,48 +336,43 @@ public class SltAgreementInfoController extends BaseController {
     private void expOutExcelAll(HttpServletResponse response, List<SltLeaseInfo> lease,List<SltLeaseInfo> lose,List<SltLeaseInfo> repair,List<SltLeaseInfo> scrap,List<SltLeaseInfo> reduction,
                                 String filename,String projectName,String unitName,BigDecimal totalCostLease,BigDecimal totalCostLose,BigDecimal totalCostRepair,BigDecimal totalCostScrap,BigDecimal totalCostReduction)
             throws Exception {
-        List<Map<String, Object>> resultsLease = new ArrayList<Map<String, Object>>();
-        List<Map<String, Object>> resultsLose = new ArrayList<Map<String, Object>>();
-        List<Map<String, Object>> resultsRepair = new ArrayList<Map<String, Object>>();
-        List<Map<String, Object>> resultsScrap = new ArrayList<Map<String, Object>>();
-        List<Map<String, Object>> resultsReduction = new ArrayList<Map<String, Object>>();
+        List<Map<String, Object>> resultsLease = new ArrayList<>();
+        List<Map<String, Object>> resultsLose = new ArrayList<>();
+        List<Map<String, Object>> resultsRepair = new ArrayList<>();
+        List<Map<String, Object>> resultsScrap = new ArrayList<>();
+        List<Map<String, Object>> resultsReduction = new ArrayList<>();
         if (lease!= null) {
             int sizeLease = lease.size();
-            for (int i = 0; i < sizeLease; i++) {
-                SltLeaseInfo bean = lease.get(i);
-                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean,1,1);
+            for (SltLeaseInfo bean : lease) {
+                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean, 1, 1);
                 resultsLease.add(maps);
             }
         }
         if (lose!= null) {
             int sizeLose = lose.size();
-            for (int i = 0; i < sizeLose; i++) {
-                SltLeaseInfo bean = lose.get(i);
-                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean,2,1);
+            for (SltLeaseInfo bean : lose) {
+                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean, 2, 1);
                 resultsLose.add(maps);
             }
         }
         if (repair!= null) {
             int sizeRepair = repair.size();
-            for (int i = 0; i < sizeRepair; i++) {
-                SltLeaseInfo bean = repair.get(i);
-                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean,3,1);
+            for (SltLeaseInfo bean : repair) {
+                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean, 3, 1);
                 resultsRepair.add(maps);
             }
         }
         if (scrap!= null) {
             int sizeScrap = scrap.size();
-            for (int i = 0; i < sizeScrap; i++) {
-                SltLeaseInfo bean = scrap.get(i);
-                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean,4,1);
+            for (SltLeaseInfo bean : scrap) {
+                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean, 4, 1);
                 resultsScrap.add(maps);
             }
         }
         if (reduction!= null) {
             int sizeReduction = reduction.size();
-            for (int i = 0; i < sizeReduction; i++) {
-                SltLeaseInfo bean = reduction.get(i);
-                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean,5,1);
+            for (SltLeaseInfo bean : reduction) {
+                Map<String, Object> maps = outReceiveDetailsBeanToMap(bean, 5, 1);
                 resultsReduction.add(maps);
             }
         }