From 0cd4c175be04a31371e391cb11682e3d042fb743 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 14:53:08 +0800
Subject: [PATCH] feat(product-order): 添加产品订单交期字段

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

diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index 9528922..aef7ead 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -24,9 +24,9 @@
         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
         <where>
-            1 = 1
+            t3.type = 1
             <if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
-                AND  t4.scheduling_user_uame LIKE CONCAT('%',#{salesLedgerDto.schedulingUserName},'%')
+                AND  t4.scheduling_user_name LIKE CONCAT('%',#{salesLedgerDto.schedulingUserName},'%')
             </if>
             <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
                 AND  T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
@@ -40,14 +40,52 @@
             <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
                 AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
             </if>
-            <if test="salesLedgerDto.schedulingDateStart != null and salesLedgerDto.schedulingDateStart != '' ">
+            <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
                 AND t4.scheduling_date &gt;= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
             </if>
-            <if test="salesLedgerDto.schedulingDateEnd != null and salesLedgerDto.schedulingDateEnd != '' ">
+            <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
                 AND  t4.scheduling_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
             </if>
         </where>
         group by t4.id
-        order by t4.update_time desc
+        order by t4.scheduling_date desc
     </select>
-</mapper>
\ No newline at end of file
+    <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,
+        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
+        <where>
+            <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>
+
+</mapper>

--
Gitblit v1.9.3