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

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

diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index 42090a7..3535b77 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -53,35 +53,58 @@
     <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
+        slpa.scheduling_user_id,
+        slpa.scheduling_user_name,
+        sum(ppout.quantity) as output_num,
+        sum(slpa.finished_num * work_hours) as wages,
+        CONCAT(
+        ROUND(
+        CASE
+        WHEN SUM(ppout.quantity) = 0 OR SUM(ppout.quantity) IS NULL THEN 0
+        ELSE SUM(slpa.finished_num) * 100.0 / SUM(ppout.quantity)
+        END,
+        2
+        ),
+        '%'
+        ) 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
+        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 test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
+                and slpa.scheduling_user_name = #{ew.schedulingUserName}
             </if>
+            <if test="ew.entryDate != null ">
+                and slpa.scheduling_date >= #{ew.entryDate}
+                and slpa.scheduling_date &lt; DATE_ADD(DATE(#{ew.entryDate}), INTERVAL 1 DAY)
+            </if>
+            <if test="ew.entryDateStart != null and ew.entryDateEnd != null">
+                and slpa.scheduling_date >= #{ew.entryDateStart}
+                and slpa.scheduling_date &lt; DATE_ADD(DATE(#{ew.entryDateEnd}), INTERVAL 1 DAY)
+            </if>
+
         </where>
         GROUP BY slpa.scheduling_user_name
 
     </select>
 
-
-
     <select id="selectDailyWagesStats" resultType="java.util.Map">
-        SELECT
-            DATE_FORMAT(scheduling_date, '%Y-%m-%d') as date,
-            SUM(finished_num * work_hours) as wages
-        FROM
-            sales_ledger_production_accounting
-        WHERE
-            scheduling_date &gt;= #{startDate}
-            AND scheduling_date &lt;= #{endDate}
-        GROUP BY
-            scheduling_date
+        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 &gt;= #{startDate}
+          AND ppout.create_time &lt; #{endDate}
+        GROUP BY DATE(ppout.create_time)
+        ORDER BY DATE(ppout.create_time);
     </select>
+
+
 </mapper>

--
Gitblit v1.9.3