From 6f9a6ab204dff2c3cc7ef6ed009a954a6e191357 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 二月 2026 16:03:29 +0800
Subject: [PATCH] fix(production): 修正生产统计数据计算逻辑

---
 src/main/resources/mapper/production/ProductProcessMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index f8ba285..5b1ac18 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -21,14 +21,15 @@
     <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
         SELECT
         pp.name AS processName,
-        SUM((ppo.quantity + ppo.scrap_qty) * pp.salary_quota) AS totalInput,
-        SUM(ppo.scrap_qty * pp.salary_quota) AS totalScrap,
-        SUM(ppo.quantity * pp.salary_quota) AS totalOutput
+        SUM(pi.quantity) AS totalInput,
+        SUM(distinct ppo.scrap_qty) AS totalScrap,
+        SUM(distinct (ppo.quantity - ppo.scrap_qty)) AS totalOutput
         FROM
         production_product_output ppo
         INNER JOIN production_product_main ppm ON ppo.product_main_id = ppm.id
         INNER JOIN product_process_route_item ppri ON ppm.product_process_route_item_id = ppri.id
         INNER JOIN product_process pp ON ppri.process_id = pp.id
+        INNER JOIN production_product_input pi ON pi.product_main_id = ppm.id
         <where>
             <if test="startDateTime != null">
                 AND ppo.create_time &gt;= #{startDateTime}

--
Gitblit v1.9.3