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/sales/SalesLedgerProductMapper.xml | 40 ++----------
src/main/resources/mapper/basic/SupplierManageMapper.xml | 46 ++++-----------
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 40 ++----------
3 files changed, 29 insertions(+), 97 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>
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index a818160..35e7dd8 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -59,38 +59,14 @@
IFNULL(approved_qty.approved_stock_in_num, 0) AS approved_stock_in_num
FROM sales_ledger_product slp
LEFT JOIN (
- SELECT rel.sales_ledger_product_id,
- IFNULL(SUM(rel.stock_in_num), 0) AS approved_stock_in_num
- FROM (
- SELECT slp.id AS sales_ledger_product_id,
- sir.stock_in_num
- FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp
- ON slp.type = 2
- AND TRIM(sir.record_type) = '7'
- AND sir.record_id = slp.sales_ledger_id
- AND (
- (sir.batch_no IS NOT NULL AND sir.batch_no LIKE CONCAT('%-', slp.id))
- OR (sir.batch_no IS NULL AND sir.product_model_id = slp.product_model_id)
- )
- WHERE sir.approval_status = 1
-
- UNION ALL
-
- SELECT slp.id AS sales_ledger_product_id,
- sir.stock_in_num
- FROM stock_in_record sir
- INNER JOIN quality_inspect qi
- ON TRIM(sir.record_type) = '10'
- AND sir.record_id = qi.id
- INNER JOIN sales_ledger_product slp
- ON slp.type = 2
- AND slp.sales_ledger_id = qi.purchase_ledger_id
- AND slp.product_model_id = qi.product_model_id
- WHERE sir.approval_status = 1
- ) rel
- GROUP BY rel.sales_ledger_product_id
- ) approved_qty ON approved_qty.sales_ledger_product_id = slp.id
+ SELECT
+ purchase_ledger_id,
+ product_model_id,
+ SUM(IFNULL(quantity, 0)) AS approved_stock_in_num
+ FROM quality_inspect
+ WHERE inspect_state = 1
+ GROUP BY purchase_ledger_id, product_model_id
+ ) approved_qty ON approved_qty.purchase_ledger_id = slp.sales_ledger_id AND approved_qty.product_model_id = slp.product_model_id
WHERE slp.type = 2
) product_status
GROUP BY product_status.sales_ledger_id
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 49569de..dde96d9 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -60,38 +60,14 @@
GROUP BY sales_ledger_product_id
) t3 ON t3.sales_ledger_product_id = T1.id
LEFT JOIN (
- SELECT rel.sales_ledger_product_id,
- IFNULL(SUM(rel.stock_in_num), 0) AS approved_stock_in_num
- FROM (
- SELECT slp.id AS sales_ledger_product_id,
- sir.stock_in_num
- FROM stock_in_record sir
- INNER JOIN sales_ledger_product slp
- ON slp.type = 2
- AND TRIM(sir.record_type) = '7'
- AND sir.record_id = slp.sales_ledger_id
- AND (
- (sir.batch_no IS NOT NULL AND sir.batch_no LIKE CONCAT('%-', slp.id))
- OR (sir.batch_no IS NULL AND sir.product_model_id = slp.product_model_id)
- )
- WHERE sir.approval_status = 1
-
- UNION ALL
-
- SELECT slp.id AS sales_ledger_product_id,
- sir.stock_in_num
- FROM stock_in_record sir
- INNER JOIN quality_inspect qi
- ON TRIM(sir.record_type) = '10'
- AND sir.record_id = qi.id
- INNER JOIN sales_ledger_product slp
- ON slp.type = 2
- AND slp.sales_ledger_id = qi.purchase_ledger_id
- AND slp.product_model_id = qi.product_model_id
- WHERE sir.approval_status = 1
- ) rel
- GROUP BY rel.sales_ledger_product_id
- ) t4 ON t4.sales_ledger_product_id = T1.id
+ SELECT
+ purchase_ledger_id,
+ product_model_id,
+ SUM(IFNULL(quantity, 0)) AS approved_stock_in_num
+ FROM quality_inspect
+ WHERE inspect_state = 1
+ GROUP BY purchase_ledger_id, product_model_id
+ ) t4 ON t4.purchase_ledger_id = T1.sales_ledger_id AND t4.product_model_id = T1.product_model_id
left join product_model pm ON T1.product_model_id = pm.id
left join product p ON pm.product_id = p.id
<where>
--
Gitblit v1.9.3