From bb1befa2a8abae3f75cc71b524c46a6d206cb46b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 10:47:01 +0800
Subject: [PATCH] feat(production): 添加生产核算功能和相关接口

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index b513ac1..6cbad29 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -18,18 +18,21 @@
         pl.supplier_name,
         pl.project_name,
         pl.contract_amount,
-        sum(pr.tickets_amount)as receipt_payment_amount,
-        pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
+        IFNULL(sum(tr.invoice_amount),0) as receipt_payment_amount,
+        pl.contract_amount-IFNULL(sum(tr.invoice_amount),0) AS unReceipt_payment_amount,
         pl.entry_date,
+        pl.execution_date,
         pl.recorder_id,
         pl.recorder_name,
         pl.template_name,
-        pl.approver_id,
+        pl.approve_user_ids,
         sm.is_white,
         pl.approval_status,
         pl.payment_method
         from purchase_ledger pl
+        left join sales_ledger_product slp on slp.sales_ledger_id = pl.id and slp.type=2
         left join product_record pr on pl.id = pr.purchase_ledger_id
+        left join ticket_registration tr on tr.id = pr.ticket_registration_id
         left join supplier_manage sm on pl.supplier_id = sm.id
         <where>
             1 = 1
@@ -77,8 +80,28 @@
             supplier_manage T2 ON T1.supplier_id = T2.id
                 LEFT JOIN
             sys_user T3 ON T3.user_id = T1.registrant_id
-        left join ticket_registration T4 on T1.ticket_registration_id = T4.id
         WHERE
-            T4.id = #{id}
+            T1.sales_ledger_product_id = #{id}
+    </select>
+
+
+    <select id="selectPurchaseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+        SELECT DATE_FORMAT(entry_date, #{dateFormat}) as dateStr, IFNULL(SUM(contract_amount), 0) as amount
+        FROM purchase_ledger
+        WHERE entry_date BETWEEN #{startDate} AND #{endDate}
+        GROUP BY dateStr
+    </select>
+
+    <select id="selectTotalPurchaseAmount" resultType="java.math.BigDecimal">
+        SELECT IFNULL(SUM(contract_amount), 0)
+        FROM purchase_ledger
+        <where>
+            <if test="startDate != null and startDate != ''">
+                AND entry_date &gt;= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND entry_date &lt;= #{endDate}
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3