From 61e45a2a7c94d845de5b9ace90bfee4bc9af4fd2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 01 四月 2026 11:32:21 +0800
Subject: [PATCH] 显示料号
---
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index aef7ead..1db1229 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -18,11 +18,16 @@
T1.customer_name,
t3.product_category,
t3.specification_model,
- t3.unit
+ t3.unit,
+ pm.material_code as materialCode
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 production_product_main ppm ON t4.product_main_id = ppm.id
+ LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ LEFT JOIN product_order po ON pwo.product_order_id = po.id
+ LEFT JOIN sales_ledger T1 ON T1.id = po.sales_ledger_id
+ LEFT JOIN sales_ledger_product t3 ON po.sale_ledger_product_id = t3.id
+ LEFT JOIN product_model pm ON po.product_model_id = pm.id
<where>
t3.type = 1
<if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
@@ -68,7 +73,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 +93,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