From bee04140fad1310e3d2e66ccbeb6f8b649bff6e8 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 28 一月 2026 17:54:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 2fdd8d3..ae9f718 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -147,7 +147,7 @@
LEFT JOIN product_structure ps ON pb.id = ps.bom_id
LEFT JOIN product_model pm1 ON pm1.id = ps.product_model_id
LEFT JOIN product p ON p.id = pm1.product_id
- WHERE sl.id = #{salesLedegerId}) A
+ WHERE sl.id = #{salesLedegerId}) A
group by a.model, a.product_name, a.unit
</select>
<select id="selectProduct" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
@@ -158,4 +158,46 @@
from product_model pm
left join product p on pm.product_id = p.id
</select>
-</mapper>
\ No newline at end of file
+
+ <select id="selectProductSalesAnalysis" resultType="java.util.LinkedHashMap">
+ SELECT
+ product_category as name,
+ SUM( tax_inclusive_total_price ) AS value
+ FROM
+ sales_ledger_product
+ WHERE
+ type = 1
+ GROUP BY
+ product_category
+ ORDER BY
+ value DESC
+ LIMIT 5
+ </select>
+
+ <select id="selectRawMaterialPurchaseAnalysis" resultType="java.util.LinkedHashMap">
+ SELECT
+ pr.product_name AS name,
+ SUM( slp.tax_inclusive_total_price ) AS value
+ FROM
+ sales_ledger_product slp
+ JOIN product pr ON slp.product_id = pr.id
+ WHERE
+ slp.type = 2
+ AND pr.parent_id = ( SELECT id FROM product WHERE product_name = '鍘熸潗鏂�' )
+ GROUP BY
+ pr.id,
+ pr.product_name
+ ORDER BY
+ value DESC
+ LIMIT 5
+ </select>
+
+ <select id="selectProductCountByTypeAndDate" resultType="int">
+ SELECT COUNT(*)
+ FROM sales_ledger_product
+ WHERE type = #{type}
+ AND register_date >= #{startDate}
+ AND register_date <= #{endDate}
+ </select>
+
+</mapper>
--
Gitblit v1.9.3