From 80886d3c19a4c35fdb9cee485c13710a7fe26ceb Mon Sep 17 00:00:00 2001
From: sunyugang <sun_shine1229@163.com>
Date: Fri, 5 Sep 2025 17:20:45 +0800
Subject: [PATCH] =?UTF-8?q?0904-=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

---
 .../service/impl/ProMeterialConsumeServiceImpl.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/ProMeterialConsumeServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMeterialConsumeServiceImpl.java
index 3310406..314dfb8 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMeterialConsumeServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMeterialConsumeServiceImpl.java
@@ -11,6 +11,7 @@ import com.ktg.mes.pro.service.IProYearReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.Year;
 import java.time.YearMonth;
 import java.util.List;
@@ -49,7 +50,13 @@ public class ProMeterialConsumeServiceImpl extends ServiceImpl<ProMeterialConsum
         this.updateById(ProMeterialConsume.builder().id(obj.getId()).productQuantity(obj.getProductQuantity())
                 .itemQuantity(obj.getItemQuantity()).build());
         //修改以后更新月报表
-        proMonthReportService.computeReport(YearMonth.now());
-        proYearReportService.computeReport(Year.now());
+        ProMeterialConsume saved = baseMapper.selectById(obj.getId());
+        LocalDate localDate = saved.getRecordDate().toInstant()
+                .atZone(java.time.ZoneId.systemDefault())
+                .toLocalDate();
+        YearMonth yearMonth = YearMonth.from(localDate);
+        Year year = Year.of(yearMonth.getYear());
+        proMonthReportService.computeReport(yearMonth);
+        proYearReportService.computeReport(year);
     }
 }
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
index 1d56905..deea992 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
@@ -194,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         IFNULL(t5.productQuantity, 0) AS productQuantity
         FROM
         pro_workorder t1
+        left join pro_machinery_job t2 on t1.workorder_id = t2.workorder_id and t2.job_status != 'CANCEL'
         -- 获取最早发料日期（替代 ROW_NUMBER）
         LEFT JOIN (
         SELECT workorder_id, MIN(issue_date) AS issue_date