From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 37822b7..7bd596c 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -2,13 +2,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductProcessMapper">
- <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
+ <select id="listPage" resultType="com.ruoyi.production2.dto.ProductProcessDto">
SELECT
- p.id,
- p.name,
- p.no,
- p.remark,
- p.salary_quota
+ *
FROM
product_process p
<where>
@@ -21,4 +17,38 @@
</where>
order by p.id asc
</select>
+
+ <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
+ SELECT
+ pp.name AS processName,
+ 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}
+ </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