From 6f7ebcb4f8ccbb8849c4d2832f28a89c30b5bc93 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 16:45:38 +0800
Subject: [PATCH] fix: 供应商往来不合格放行入库的也算入库
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 3e8397e..c38dac0 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -82,7 +82,7 @@
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 sales_ledger_product slp ON slp.sales_ledger_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
@@ -106,6 +106,29 @@
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 = 11
) t
GROUP BY t.supplier_id
) T3 ON T3.supplier_id = T1.supplier_id
@@ -132,7 +155,7 @@
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
+ INNER JOIN sales_ledger_product slp ON slp.sales_ledger_id = sir.record_id
WHERE sir.approval_status = 1 AND sir.record_type = 7 AND slp.type = 2
UNION ALL
SELECT
--
Gitblit v1.9.3