From cb4a2a86fcce49d0a4a22e365786bc855c96218b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 25 五月 2026 02:46:37 +0800
Subject: [PATCH] test: 供应商往来的金额累加、采购台账入库状态
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 6f3ec54..b318be2 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -77,23 +77,13 @@
T1.contractAmounts - IFNULL(T3.InboundAmount, 0) AS unshippedAmount
FROM (SELECT supplier_id, SUM(contract_amount) AS contractAmounts FROM purchase_ledger GROUP BY supplier_id) T1
LEFT JOIN (
- 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
- 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
- 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
- ) t
- GROUP BY t.supplier_id
+ SELECT pl.supplier_id,
+ SUM(IFNULL(qi.quantity, 0) * slp.tax_inclusive_unit_price) AS InboundAmount
+ FROM quality_inspect qi
+ 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 = qi.product_model_id
+ WHERE qi.inspect_state = 1 AND slp.type = 2
+ GROUP BY pl.supplier_id
) T3 ON T3.supplier_id = T1.supplier_id
LEFT JOIN supplier_manage sm ON T1.supplier_id = sm.id
<where>
@@ -113,22 +103,12 @@
pl.contract_amount - IFNULL(T2.InboundAmount, 0) AS unshippedAmount
FROM purchase_ledger pl
LEFT JOIN (
- 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
- 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
- UNION ALL
- SELECT sir.stock_in_num * slp.tax_inclusive_unit_price AS inbound_amount, slp.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
- ) t
- GROUP BY t.sales_ledger_id
+ SELECT slp.sales_ledger_id,
+ SUM(IFNULL(qi.quantity, 0) * slp.tax_inclusive_unit_price) AS InboundAmount
+ FROM quality_inspect qi
+ INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = qi.purchase_ledger_id AND slp.product_model_id = qi.product_model_id
+ WHERE qi.inspect_state = 1 AND slp.type = 2
+ GROUP BY slp.sales_ledger_id
) T2 ON T2.sales_ledger_id = pl.id
WHERE pl.supplier_id = #{supplierId}
</select>
--
Gitblit v1.9.3