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 ++++++++--------------------------------
 1 files changed, 8 insertions(+), 32 deletions(-)

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