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/ProductionProductMainMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index df33e70..8abeb57 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -76,11 +76,11 @@
pm.model as product_model_name,
pm.unit,
slpa.process,
- ppo.quantity,
+ COALESCE(prp.quantity, slpa.finished_num) AS quantity,
slpa.work_hours,
slpa.work_hours * slpa.finished_num AS wages,
dl.device_name,
- slpa.work_hour as work_minutes,
+ slpa.work_hour as person_work_minutes,
IFNULL(
TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
0
@@ -91,6 +91,7 @@
FROM
production_product_main ppm
LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id
+ LEFT JOIN production_report_person prp ON prp.product_main_id = ppm.id AND prp.user_id = slpa.scheduling_user_id
LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id
LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
LEFT JOIN product_order po ON po.id = pwo.product_order_id
--
Gitblit v1.9.3