From 47596a855703fbb57e9c4feaf05b601ec07854ef Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 09 五月 2026 11:41:58 +0800
Subject: [PATCH] fix:1.退料审核 2.工序加上工时-生产订单-报工填写 3.核算加上工时计算
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index f213a5f..4be1c23 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -29,15 +29,31 @@
pa.scheduling_user_id as schedulingUserId,
pa.scheduling_user_name as schedulingUserName,
cast(sum(
- 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
+ when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.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
+ end
end
) as decimal(18,4)) as wages,
cast(sum(ifnull(pa.finished_num, 0)) as decimal(18,4)) as finishedNum,
cast(sum(ifnull(pa.work_hours, 0)) as decimal(18,4)) as workHours,
+ cast(sum(ifnull(ppm.work_hour, 0)) as decimal(18,4)) as workHour,
+ case
+ when sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) = 0 then '0%'
+ else concat(
+ cast(
+ round(
+ sum(ifnull(ppo.quantity, 0)) /
+ sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) * 100, 2
+ ) as char
+ ),
+ '%'
+ )
+ end as outputRate,
group_concat(distinct pa.technology_operation_name order by pa.technology_operation_name separator ',') as process,
case
when count(distinct date(pa.scheduling_date)) = 1 then min(date(pa.scheduling_date))
@@ -55,6 +71,13 @@
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
+ left join (
+ select production_product_main_id,
+ cast(sum(ifnull(quantity, 0)) as decimal(18,4)) as quantity,
+ cast(sum(ifnull(scrap_qty, 0)) as decimal(18,4)) as scrapQty
+ from production_product_output
+ group by production_product_main_id
+ ) ppo on ppo.production_product_main_id = ppm.id
<where>
<if test="c != null">
<if test="c.productCategory != null and c.productCategory != ''">
--
Gitblit v1.9.3