From dfa9258c8879dbb0d1bfc00d7f939031d0bb623b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 18:32:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index ea766e6..ac3ccc5 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -50,4 +50,24 @@
         group by t4.id
         order by t4.scheduling_date desc
     </select>
+    <select id="pageProductionAccounting"
+            resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
+        SELECT
+            slpa.scheduling_user_id,
+            slpa.scheduling_user_name,
+               sum(ppout.quantity) as output_num,
+               sum(slpa.finished_num * work_hours) as  wages,
+               SUM(slpa.finished_num) / SUM(ppout.quantity) 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_output ppout ON ppm.id = ppout.product_main_id
+        <where>
+            <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''" >
+                and slpa.scheduling_user_name  = #{ew.schedulingUserName}
+            </if>
+        </where>
+        GROUP BY slpa.scheduling_user_name
+
+    </select>
+
 </mapper>

--
Gitblit v1.9.3