From 844cae1a3be7bd2fbf8803a7ee33b0622208de05 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 29 四月 2026 09:43:43 +0800
Subject: [PATCH] fix(production): 修复生产报表数据查询问题
---
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 7e16334..842b872 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -78,8 +78,8 @@
ppo.quantity,
slpa.work_hours,
slpa.work_hours * slpa.finished_num AS wages,
- ppm.device_name,
- ppm.device_id,
+ dl.device_name,
+ slpa.work_hour as work_minutes,
IFNULL(
TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
0
@@ -94,6 +94,7 @@
LEFT JOIN product_model pm ON po.product_model_id = pm.id
LEFT JOIN product p ON p.id = pm.product_id
LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
+ left join device_ledger dl ON dl.id = slpa.device_id
where ppm.audit_status = 1
<if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
and slpa.scheduling_user_name = #{ew.schedulingUserName}
--
Gitblit v1.9.3