From f00a59b4f30accf2b23ae0d58fac23d966a48d24 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 13 六月 2026 20:11:51 +0800
Subject: [PATCH] fix: 优化生产订单查询
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 102 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 6f3ec54..1df63aa 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -68,7 +68,7 @@
</if>
</where>
</select>
-
+
<select id="supplierTransactions" resultType="com.ruoyi.purchase.vo.SupplierTransactionsVo">
SELECT T1.supplier_id,
sm.supplier_name,
@@ -82,16 +82,53 @@
FROM (
SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, pl.supplier_id
FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp ON slp.id = sir.record_id
+ INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = sir.record_id
INNER JOIN purchase_ledger pl ON pl.id = slp.sales_ledger_id
WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
UNION ALL
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, pl.supplier_id
- FROM stock_in_record sir
- INNER JOIN quality_inspect qi ON qi.id = sir.record_id
- INNER JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
- INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = pl.id AND slp.product_model_id = sir.product_model_id
- WHERE sir.approval_status = 1 AND sir.record_type = 10 AND slp.type = 2
+ SELECT
+ sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
+ pl2.supplier_id
+ FROM stock_in_record sir
+ INNER JOIN quality_inspect qi
+ ON qi.id = sir.record_id
+ INNER JOIN purchase_ledger pl2
+ ON pl2.id = qi.purchase_ledger_id
+ INNER JOIN (
+ SELECT
+ sales_ledger_id,
+ product_model_id,
+ MIN(tax_inclusive_unit_price) AS tax_inclusive_unit_price
+ FROM sales_ledger_product
+ WHERE type = 2
+ GROUP BY sales_ledger_id, product_model_id
+ ) slp_agg
+ ON slp_agg.sales_ledger_id = pl2.id
+ AND slp_agg.product_model_id = sir.product_model_id
+ WHERE sir.approval_status = 1 AND sir.record_type = 10
+ UNION ALL
+ SELECT sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
+ pl2.supplier_id
+ FROM stock_in_record sir
+ INNER JOIN quality_unqualified qu
+ ON qu.id = sir.record_id
+ INNER JOIN quality_inspect qi
+ ON qi.id = qu.inspect_id
+ INNER JOIN purchase_ledger pl2
+ ON pl2.id = qi.purchase_ledger_id
+ INNER JOIN (
+ SELECT
+ sales_ledger_id,
+ product_model_id,
+ MIN(tax_inclusive_unit_price) AS tax_inclusive_unit_price
+ FROM sales_ledger_product
+ WHERE type = 2
+ GROUP BY sales_ledger_id, product_model_id
+ ) slp_agg
+ ON slp_agg.sales_ledger_id = pl2.id
+ AND slp_agg.product_model_id = sir.product_model_id
+ WHERE sir.approval_status = 1
+ AND sir.record_type = 11
) t
GROUP BY t.supplier_id
) T3 ON T3.supplier_id = T1.supplier_id
@@ -118,15 +155,52 @@
FROM (
SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, slp.sales_ledger_id
FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp ON slp.id = sir.record_id
+ INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = sir.record_id
WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
UNION ALL
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, slp.sales_ledger_id
+ SELECT
+ sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
+ slp_agg.sales_ledger_id
FROM stock_in_record sir
- INNER JOIN quality_inspect qi ON qi.id = sir.record_id
- INNER JOIN purchase_ledger pl2 ON pl2.id = qi.purchase_ledger_id
- INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = pl2.id AND slp.product_model_id = sir.product_model_id
- WHERE sir.approval_status = 1 AND sir.record_type = 10 AND slp.type = 2
+ INNER JOIN quality_inspect qi
+ ON qi.id = sir.record_id
+ INNER JOIN purchase_ledger pl2
+ ON pl2.id = qi.purchase_ledger_id
+ INNER JOIN (
+ SELECT
+ sales_ledger_id,
+ product_model_id,
+ MIN(tax_inclusive_unit_price) AS tax_inclusive_unit_price
+ FROM sales_ledger_product
+ WHERE type = 2
+ GROUP BY sales_ledger_id, product_model_id
+ ) slp_agg
+ ON slp_agg.sales_ledger_id = pl2.id
+ AND slp_agg.product_model_id = sir.product_model_id
+ WHERE sir.approval_status = 1 AND sir.record_type = 10
+ UNION ALL
+ SELECT sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
+ slp_agg.sales_ledger_id
+ FROM stock_in_record sir
+ INNER JOIN quality_unqualified qu
+ ON qu.id = sir.record_id
+ INNER JOIN quality_inspect qi
+ ON qi.id = qu.inspect_id
+ INNER JOIN purchase_ledger pl2
+ ON pl2.id = qi.purchase_ledger_id
+ INNER JOIN (
+ SELECT
+ sales_ledger_id,
+ product_model_id,
+ MIN(tax_inclusive_unit_price) AS tax_inclusive_unit_price
+ FROM sales_ledger_product
+ WHERE type = 2
+ GROUP BY sales_ledger_id, product_model_id
+ ) slp_agg
+ ON slp_agg.sales_ledger_id = pl2.id
+ AND slp_agg.product_model_id = sir.product_model_id
+ WHERE sir.approval_status = 1
+ AND sir.record_type = 11
) t
GROUP BY t.sales_ledger_id
) T2 ON T2.sales_ledger_id = pl.id
--
Gitblit v1.9.3