From 3e17b898ed5c4a62fbad777f39c3f89953345ff2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 七月 2026 16:38:42 +0800
Subject: [PATCH] 修改工资计算
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index f0937f0..922715b 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -43,6 +43,7 @@
group_concat(distinct p_parent.product_name order by p_parent.product_name separator ',') as productCategory,
group_concat(distinct pm.model order by pm.model separator ',') as specificationModel,
group_concat(distinct pm.unit order by pm.unit separator ',') as unit,
+ ifnull(p.standard_quantity, 0) as productStandardQuantity,
pa.scheduling_user_id as schedulingUserId,
pa.scheduling_user_name as schedulingUserName,
group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
@@ -50,11 +51,9 @@
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 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
+ else case
+ when ifnull(p.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(p.standard_quantity, 0) * 8
end
end
) as decimal(18,4)) as wages,
@@ -89,6 +88,7 @@
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 technology_operation too on poro.technology_operation_id = too.id
left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
left join product p on pm.product_id = p.id
left join product p_parent on p_parent.id = p.parent_id
@@ -137,17 +137,15 @@
<select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
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,
+ case
+ when pa.adjust_amount is not null then 0
+ when poro.type = 0 then 0
+ else case
+ when ifnull(p.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(p.standard_quantity, 0) * 8
+ 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)
@@ -161,6 +159,7 @@
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)
+ left join product p on pm.product_id = p.id
where pa.scheduling_user_id = #{userId}
and date_format(pa.scheduling_date, '%Y-%m') = #{date}
and (
@@ -179,12 +178,20 @@
ifnull(ppm.work_hour, 0) as workHour,
ifnull(ppm.repair_work_hour, 0) as repairWorkHour,
ifnull(too.standard_quantity, 0) as standardQuantity,
- ifnull(too.conversion_factor, 1) as conversionFactor
+ ifnull(p.standard_quantity, 0) as productStandardQuantity,
+ ifnull(too.violin_factor, 0) as violinFactor,
+ ifnull(too.viola_factor, 0) as violaFactor,
+ ifnull(too.bass_factor, 0) as bassFactor,
+ p.product_name as productName
from production_account pa
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_routing_operation poro on pot.production_order_routing_operation_id = poro.id
left join technology_operation too on poro.technology_operation_id = too.id
+ left join production_order po on pot.production_order_id = po.id
+ left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
+ left join product p on pm.product_id = p.id
+ left join product p_parent on p_parent.id = p.parent_id
where pa.scheduling_user_id = #{userId}
and date_format(pa.scheduling_date, '%Y-%m') = #{date}
and (
--
Gitblit v1.9.3