From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面
---
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 >= #{startDateTime}
--
Gitblit v1.9.3