From 83ab4c8eabb1d2f448079c03bbb2efa09d9d468a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 25 六月 2026 09:05:55 +0800
Subject: [PATCH] feat: 售后新增消息推送、数量自定义、分页查询
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index f8ba285..b4c932a 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -15,20 +15,21 @@
AND p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
</if>
</where>
- order by p.id asc
+ order by p.id desc
</select>
<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 >= #{startDateTime}
--
Gitblit v1.9.3