From edf25c677e08103ef86f2d1b8e096af495b89202 Mon Sep 17 00:00:00 2001
From: sunyugang <sun_shine1229@163.com>
Date: Tue, 26 Aug 2025 16:48:47 +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

---
 .../pro/service/impl/ProMonthReportServiceImpl.java   | 11 ++++++++++-
 .../main/resources/mapper/pro/ProWorkorderMapper.xml  |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

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 5904588..937122d 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
@@ -64,7 +64,16 @@ public class ProMonthReportServiceImpl extends ServiceImpl<ProMonthReportMapper,
             BigDecimal produce = (report.getPower().add(report.getMachinePower())).divide(report.getProductQuantity(), 4, BigDecimal.ROUND_HALF_UP);
             report.setPowerProduce(produce);
         }
-        report.setXSale(saleReport.getXSale());
+        if (saleReport.getXSale() != null){
+            report.setXSale(saleReport.getXSale().divide(new BigDecimal(1000)));
+        }else {
+            report.setXSale(BigDecimal.ZERO);
+        }
+       if (saleReport.getXdSale() != null){
+           report.setXdSale(saleReport.getXdSale().divide(new BigDecimal(1000)));
+       }else {
+           report.setXdSale(BigDecimal.ZERO);
+       }
         report.setXdSale(saleReport.getXdSale());
         this.saveOrUpdate(report);
     }
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
index 0dbbcf3..0569134 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
@@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-
         <result property="machineryId"    column="machinery_id"    />
         <result property="machineryCode"    column="machinery_code"    />
         <result property="machineryName"    column="machinery_name"    />