From a27fdf6b900e267eb84e1c6a5e1a693ee90d1274 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 九月 2026 21:17:05 +0800
Subject: [PATCH] feat(stock): 添加库存报表导出功能并完善库存入库字段Excel注解
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 2156690..9df0a0c 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -73,8 +73,6 @@
(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,
@@ -87,7 +85,20 @@
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
+ UNION ALL
+
+ SELECT slp.id AS sales_ledger_product_id,
+ sir.stock_in_num
+ FROM stock_in_record sir
+ INNER JOIN quality_unqualified qu
+ ON TRIM(sir.record_type) = '11'
+ AND sir.record_id = qu.id
+ INNER JOIN quality_inspect qi
+ ON qi.id = qu.inspect_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
) rel
GROUP BY rel.sales_ledger_product_id
) approved_qty ON approved_qty.sales_ledger_product_id = slp.id
--
Gitblit v1.9.3