From a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 14:36:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index ae9f718..2a1b94a 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -31,7 +31,7 @@
left join production_product_main ppm on qi.product_main_id = ppm.id
left join product_work_order pwo on ppm.work_order_id = pwo.id
left join product_order po on pwo.product_order_id = po.id
- left join sales_ledger_product slp on po.product_model_id = slp.id
+ left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id
where qi.product_main_id = #{productMainId}
@@ -80,6 +80,9 @@
slp.type = 2
<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},'%')
@@ -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