加入辅料备件

klp-ems/src/main/java/com/klp/ems/controller/EnergyCostReportController.java

@@ -104,6 +104,8 @@ public class EnergyCostReportController extends BaseController {
             vo.setCurrentCoilNo(item.getCurrentCoilNo());
             vo.setEnergyCost(item.getTotalEnergyCost());
             vo.setStockCost(item.getStockCost());
+            vo.setAuxCost(item.getAuxCost());
+            vo.setSpareCost(item.getSpareCost());
             vo.setTotalCost(item.getTotalCost());
             return vo;
         }).collect(Collectors.toList());

klp-ems/src/main/java/com/klp/ems/domain/vo/CoilTotalCostVo.java

@@ -25,10 +25,17 @@ public class CoilTotalCostVo implements Serializable {
     private Double totalEnergyCost;
     /** 囤积成本（当日/按 stock 计算） */
     private Double stockCost;
+
+    /** 辅料成本 */
+    private Double auxCost;
+
+    /** 备件成本 */
+    private Double spareCost;
+
     /** 净重 */
     private Double totalNetWeight;
     /** 毛重 */
     private Double totalGrossWeight;
-    /** 总成本（能源+囤积） */
+    /** 总成本（能源+囤积+辅料+备件） */
     private Double totalCost;
 }

klp-ems/src/main/java/com/klp/ems/domain/vo/CoilTotalMergedExportVo.java

@@ -23,6 +23,12 @@ public class CoilTotalMergedExportVo implements Serializable {
     @ExcelProperty("囤积成本")
     private Double stockCost;
 
+    @ExcelProperty("辅料成本")
+    private Double auxCost;
+
+    @ExcelProperty("备件成本")
+    private Double spareCost;
+
     @ExcelProperty("总成本")
     private Double totalCost;
 }