From 3b35765e3f12372ae67ebc0903798de09bc7b24c Mon Sep 17 00:00:00 2001
From: sunyugang <sun_shine1229@163.com>
Date: Wed, 27 Aug 2025 14:30:31 +0800
Subject: [PATCH] =?UTF-8?q?0826-=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ktg/mes/pro/domain/ProMonthReport.java | 4 ++--
 .../mes/pro/service/impl/ProMonthReportServiceImpl.java  | 9 ++++++---
 .../main/resources/mapper/pro/ProMonthReportMapper.xml   | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProMonthReport.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProMonthReport.java
index fa5699c..8b423c1 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProMonthReport.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProMonthReport.java
@@ -90,9 +90,9 @@ public class ProMonthReport {
     private BigDecimal machineShopPower;
 
     /**
-     * 吨/度
+     * 度/吨
      */
-    @Excel(name = "吨/度")
+    @Excel(name = "度/吨")
     private BigDecimal powerProduce;
 
     /**
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java
index 937122d..7e8b55b 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMonthReportServiceImpl.java
@@ -61,7 +61,8 @@ public class ProMonthReportServiceImpl extends ServiceImpl<ProMonthReportMapper,
                 && report.getProductQuantity().compareTo(new BigDecimal(0)) > 0
                 && report.getMachineShopPower() !=null
                 && report.getMachineShopPower().compareTo(new BigDecimal(0)) > 0) {
-            BigDecimal produce = (report.getPower().add(report.getMachinePower())).divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
+            BigDecimal power = report.getPower().add(report.getMachineShopPower());
+            BigDecimal produce = power.divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
             report.setPowerProduce(produce);
         }
         if (saleReport.getXSale() != null){
@@ -124,8 +125,10 @@ public class ProMonthReportServiceImpl extends ServiceImpl<ProMonthReportMapper,
         proMonthReport.setMachineShopPower(obj.getMachinePower());
         // 吨/度=当月（南北电消耗+机修房电消耗）/成品
         BigDecimal power = proMonthReport.getPower().add(proMonthReport.getMachineShopPower());
-        BigDecimal powerProduce = proMonthReport.getProductQuantity().divide(power, 4, BigDecimal.ROUND_HALF_UP);
-        proMonthReport.setPowerProduce(powerProduce);
+        if (proMonthReport.getProductQuantity() != null && proMonthReport.getProductQuantity().compareTo(new BigDecimal(0)) > 0) {
+            BigDecimal powerProduce = power.divide(proMonthReport.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
+            proMonthReport.setPowerProduce(powerProduce);
+        }
         this.updateById(proMonthReport);
     }
 }
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProMonthReportMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProMonthReportMapper.xml
index 26850f0..c199056 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProMonthReportMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProMonthReportMapper.xml
@@ -28,7 +28,7 @@
              left join wm_product_salse_line wpsl on wps.salse_id  = wpsl.salse_id
              left join md_item mi on wpsl.item_id = mi.item_id
         where date_format(wps.salse_date,'%y%m%d') &gt;= date_format(#{beginDate},'%y%m%d')
-          and date_format(wps.salse_date,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
+          and date_format(wps.salse_date,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d') and wps.status = 'FINISHED'
     </select>
 
     <select id="powerYearSummaryStatistics" resultType="com.ktg.mes.pro.domain.ProMonthReport">