From 9bbcbfd7d494cd4c247bab196d36f9f2f7ab52d4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 11 三月 2026 11:42:37 +0800
Subject: [PATCH] yys 工序绑定设备
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index f8ba285..9213760 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,9 +4,11 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
SELECT
- *
+ p.*,
+ dl.device_name AS deviceName
FROM
product_process p
+ left join device_ledger dl on p.device_ledger_id = dl.id
<where>
<if test="productProcessDto.name != null and productProcessDto.name != '' ">
AND p.name LIKE CONCAT('%',#{productProcessDto.name},'%')
@@ -21,14 +23,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