From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 5b1ac18..3122774 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},'%')
@@ -23,7 +25,7 @@
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
+ SUM(distinct (ppo.quantity + IFNULL(ppo.add_qty, 0))) AS totalOutput
FROM
production_product_output ppo
INNER JOIN production_product_main ppm ON ppo.product_main_id = ppm.id
--
Gitblit v1.9.3