From b43cffab6311b377628528a2e1c8b3eae14b676d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 01 六月 2026 12:31:59 +0800
Subject: [PATCH] 供应商往来和采购台账查询库存数据优化
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 85 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 78 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index fea9e55..7b6b164 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -80,12 +80,22 @@
SELECT t.supplier_id,
SUM(t.inbound_amount) AS InboundAmount
FROM (
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, pl.supplier_id
+ SELECT sir.stock_in_num * aa.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 purchase_ledger pl ON pl.id = slp.sales_ledger_id
- WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
+ 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) aa
+ ON aa.sales_ledger_id = sir.record_id
+ AND aa.product_model_id=sir.product_model_id
+ INNER JOIN purchase_ledger pl ON pl.id = aa.sales_ledger_id
+ WHERE sir.approval_status = 1 AND sir.record_type = 7
+
UNION ALL
+
SELECT
sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
pl2.supplier_id
@@ -106,6 +116,31 @@
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 = 4
) t
GROUP BY t.supplier_id
) T3 ON T3.supplier_id = T1.supplier_id
@@ -130,11 +165,22 @@
SELECT t.sales_ledger_id,
SUM(t.inbound_amount) AS InboundAmount
FROM (
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, slp.sales_ledger_id
+ SELECT sir.stock_in_num * aa.tax_inclusive_unit_price AS inbound_amount, aa.sales_ledger_id
FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp ON slp.id = sir.record_id
- WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
+ 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) aa
+ ON aa.sales_ledger_id = sir.record_id
+ AND aa.product_model_id=sir.product_model_id
+ WHERE sir.approval_status = 1 AND sir.record_type = 7
+
UNION ALL
+
SELECT
sir.stock_in_num * slp_agg.tax_inclusive_unit_price AS inbound_amount,
slp_agg.sales_ledger_id
@@ -155,6 +201,31 @@
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 = 4
) t
GROUP BY t.sales_ledger_id
) T2 ON T2.sales_ledger_id = pl.id
--
Gitblit v1.9.3