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/purchase/PurchaseLedgerMapper.xml |   40 ++++++++--------------------------------
 1 files changed, 8 insertions(+), 32 deletions(-)

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

--
Gitblit v1.9.3