From 422a5676c2d96dd37c1be62935a314d70fef79b5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 15 七月 2026 15:28:04 +0800
Subject: [PATCH] 修改不合格管理
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index fd439de..b7e27b0 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -49,7 +49,7 @@
cast(sum(
case
when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
- when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
+ when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_work_hour, 0))
else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
case
when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
@@ -101,7 +101,7 @@
) ppo on ppo.production_product_main_id = ppm.id
<where>
and ppm.audit_status = 1
- and ppm.report_type = 0
+ and ppm.report_type in (0, 1)
<if test="c != null">
<if test="c.productCategory != null and c.productCategory != ''">
and p_parent.product_name like concat('%', #{c.productCategory}, '%')
@@ -136,14 +136,40 @@
</select>
<select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
- select ifnull(sum(finished_num), 0) as accountBalance,
- ifnull(sum(work_hours), 0) as account
+ select cast(ifnull(sum(
+ case
+ when pa.adjust_amount is not null then 0
+ when poro.type = 0 then 0
+ else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
+ case
+ when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
+ then cast(substring_index(pm.model, '*', -1) as decimal(18,4))
+ else 1
+ end
+ end
+ ), 0) as decimal(18,2)) as accountBalance,
+ cast(ifnull(sum(
+ case
+ when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
+ when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_work_hour, 0))
+ else 0
+ end
+ ), 0) as decimal(18,2)) as account
from production_account pa
- inner join production_product_main ppm on ppm.id = pa.production_product_main_id
+ left join production_product_main ppm on ppm.id = pa.production_product_main_id
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ left join production_order po on pot.production_order_id = po.id
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
where pa.scheduling_user_id = #{userId}
and date_format(pa.scheduling_date, '%Y-%m') = #{date}
- and ppm.audit_status = 1
- and ppm.report_type = 0
+ and (
+ pa.production_product_main_id is null
+ or (
+ ppm.audit_status = 1
+ and ppm.report_type in (0, 1)
+ )
+ )
</select>
<select id="selectDailyWagesStats" resultType="java.util.Map">
@@ -156,7 +182,7 @@
where pa.scheduling_date >= #{startDate}
and pa.scheduling_date <= #{endDate}
and ppm.audit_status = 1
- and ppm.report_type = 0
+ and ppm.report_type in (0, 1)
group by date_format(scheduling_date, '%m-%d')
order by date_format(scheduling_date, '%m-%d')
</select>
--
Gitblit v1.9.3