From 83dfd22cd9ce3f6f92c69cbd9bfd974bd8fbdf41 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 05 二月 2026 15:54:26 +0800
Subject: [PATCH] fix: 开票台账中录入人未带出
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 5ab3631..f8ba285 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,10 +4,7 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
SELECT
- p.id,
- p.name,
- p.no,
- p.remark
+ *
FROM
product_process p
<where>
@@ -18,6 +15,39 @@
AND p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
</if>
</where>
- order by p.id desc
+ order by p.id asc
+ </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
+ 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
+ <where>
+ <if test="startDateTime != null">
+ AND ppo.create_time >= #{startDateTime}
+ </if>
+ <if test="endDateTime != null">
+ AND ppo.create_time <= #{endDateTime}
+ </if>
+ <if test="userId != null">
+ AND ppm.user_id = #{userId}
+ </if>
+ <if test="processIds != null and processIds.size() > 0">
+ AND pp.id IN
+ <foreach collection="processIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ GROUP BY
+ pp.id,
+ pp.name
</select>
</mapper>
--
Gitblit v1.9.3