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/ProductionProductMainMapper.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index e00e0da..f0dc39c 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -45,6 +45,7 @@
ifnull(ppo.quantity, 0) as quantity,
ifnull(ppo.scrap_qty, 0) as scrapQty,
p.product_name as productName,
+ ifnull(p.standard_quantity, 0) as productStandardQuantity,
pm.model as productModelName,
pm.unit,
po_sales.salesContractNo,
@@ -131,9 +132,11 @@
end as auditStatusName,
pot.work_order_no as workOrderNo,
p.product_name as productName,
+ ifnull(p.standard_quantity, 0) as productStandardQuantity,
pm.model as productModelName,
pm.unit,
pa.technology_operation_name as process,
+ ifnull(too.standard_quantity, 0) as standardQuantity,
ifnull(ppo.quantity, 0) as quantity,
ifnull(ppo.scrap_qty, 0) as scrapQty,
date(pa.scheduling_date) as schedulingDate,
@@ -147,11 +150,9 @@
cast(
case
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(too.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
end
end
as decimal(18,4)
@@ -160,11 +161,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(too.standard_quantity, 0) = 0 then 0
+ else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
end
end
as decimal(18,4)
@@ -174,6 +173,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
--
Gitblit v1.9.3