From eb5487981fc08ba0f67378b2fa66e5ca28fabba5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 07 三月 2026 11:28:14 +0800
Subject: [PATCH] 区分工序计时还是计件 调整生产核算工资计算方法
---
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index aef7ead..28501a6 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -22,7 +22,7 @@
FROM
sales_ledger_production_accounting t4
LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
+ left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and slp.type = 1
<where>
t3.type = 1
<if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
@@ -68,7 +68,7 @@
'%'
) as output_rate
FROM sales_ledger_production_accounting slpa
- LEFT JOIN production_product_main ppm ON slpa.sales_ledger_work_id = ppm.id
+ LEFT JOIN production_product_main ppm ON slpa.product_main_id = ppm.id
LEFT JOIN production_product_output ppout ON ppm.id = ppout.product_main_id
<where>
<if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
@@ -88,4 +88,23 @@
</select>
+ <select id="selectDailyWagesStats" resultType="java.util.Map">
+ SELECT DATE(ppout.create_time) AS dateStr,
+ SUM(ppout.quantity - IFNULL(ppout.scrap_qty, 0)) AS numberOfCompleted,
+ SUM((ppout.quantity - IFNULL(ppout.scrap_qty, 0)) * IFNULL(pp.salary_quota, 0)) AS amount,
+ ROUND(
+ SUM(ppout.quantity - IFNULL(ppout.scrap_qty, 0)) * 100 / NULLIF(SUM(ppout.quantity), 0),
+ 2
+ ) AS passRate
+ FROM production_product_output ppout
+ LEFT JOIN production_product_main ppm ON ppm.id = ppout.product_main_id
+ LEFT JOIN product_process_route_item ppri ON ppri.id = ppm.product_process_route_item_id
+ LEFT JOIN product_process pp ON pp.id = ppri.process_id
+ WHERE ppout.create_time >= #{startDate}
+ AND ppout.create_time < #{endDate}
+ GROUP BY DATE(ppout.create_time)
+ ORDER BY DATE(ppout.create_time);
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3