From 5bc029a31c4325d39f77fb6cb613a5e31df7ece3 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 20 四月 2026 10:26:10 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New' into dev_New_pro
---
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index 3535b77..8a32b42 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 !=''">
@@ -84,8 +84,7 @@
</if>
</where>
- GROUP BY slpa.scheduling_user_name
-
+ GROUP BY slpa.scheduling_user_id, slpa.scheduling_user_name
</select>
<select id="selectDailyWagesStats" resultType="java.util.Map">
@@ -105,6 +104,19 @@
GROUP BY DATE(ppout.create_time)
ORDER BY DATE(ppout.create_time);
</select>
+ <select id="getByUserId" resultType="com.ruoyi.production.dto.UserAccountDto">
+ select
+ slpa.scheduling_user_id as user_id,
+ pp.type,
+ sum(case when pp.type = 0 then slpa.work_hours else 0 end) as account,
+ sum(case when pp.type = 1 then slpa.work_hours else 0 end) as accountBalance
+ from sales_ledger_production_accounting slpa
+ left join product_process pp on pp.name = slpa.process
+ where slpa.scheduling_user_id = #{ew.userId}
+ and slpa.scheduling_date like concat(#{ew.date}, '%')
+ group by slpa.scheduling_user_id
+
+ </select>
</mapper>
--
Gitblit v1.9.3