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/sales/SalesLedgerProductMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index ae9f718..01f0e89 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -81,6 +81,9 @@
<if test="req.purchaseContractNumber != null and req.purchaseContractNumber != '' ">
AND sl.purchase_contract_number like concat('%',#{req.purchaseContractNumber},'%')
</if>
+ <if test="req.approvalStatus != null and req.approvalStatus != ''">
+ and sl.approval_status = #{req.approvalStatus}
+ </if>
<if test="req.customerContractNo != null and req.customerContractNo != '' ">
AND sl.customer_contract_no like concat('%',#{req.customerContractNo},'%')
</if>
@@ -159,7 +162,7 @@
left join product p on pm.product_id = p.id
</select>
- <select id="selectProductSalesAnalysis" resultType="java.util.LinkedHashMap">
+ <select id="selectProductSalesAnalysis" resultType="java.util.Map">
SELECT
product_category as name,
SUM( tax_inclusive_total_price ) AS value
@@ -174,7 +177,7 @@
LIMIT 5
</select>
- <select id="selectRawMaterialPurchaseAnalysis" resultType="java.util.LinkedHashMap">
+ <select id="selectRawMaterialPurchaseAnalysis" resultType="java.util.Map">
SELECT
pr.product_name AS name,
SUM( slp.tax_inclusive_total_price ) AS value
@@ -200,4 +203,21 @@
AND register_date <= #{endDate}
</select>
+ <select id="selectRawMaterialExpense" resultType="java.math.BigDecimal">
+ WITH RECURSIVE product_tree AS (SELECT id
+ FROM product
+ WHERE product_name = '鍘熸潗鏂�'
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id)
+ SELECT IFNULL(SUM(slp.tax_inclusive_total_price), 0)
+ FROM sales_ledger_product slp
+ WHERE slp.type = 2
+ AND slp.product_id IN (SELECT id
+ FROM product_tree);
+
+ </select>
</mapper>
--
Gitblit v1.9.3