From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个，则需要展示多个
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 07d3f5a..fdde384 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -42,9 +42,10 @@
CASE
WHEN IFNULL(ls.total_product_count, 0) = 0 THEN '寰呭叆搴�'
WHEN IFNULL(ls.full_product_count, 0) >= IFNULL(ls.total_product_count, 0) THEN '瀹屽叏鍏ュ簱'
- WHEN IFNULL(ls.approved_product_count, 0) > 0 THEN '鍏ュ簱涓�'
+ WHEN IFNULL(ls.approved_product_count, 0) > 0 OR IFNULL(ls.pending_product_count, 0) > 0 THEN '鍏ュ簱涓�'
ELSE '寰呭叆搴�'
- END AS stock_in_status
+ END AS stock_in_status,
+ IFNULL(ls.all_need_quality_check, 0) AS all_need_quality_check
FROM purchase_ledger pl
LEFT JOIN supplier_manage sm ON pl.supplier_id = sm.id
LEFT JOIN (
@@ -52,20 +53,26 @@
product_status.sales_ledger_id,
COUNT(1) AS total_product_count,
SUM(CASE WHEN product_status.approved_stock_in_num > 0 THEN 1 ELSE 0 END) AS approved_product_count,
- SUM(CASE WHEN product_status.approved_stock_in_num >= product_status.product_quantity THEN 1 ELSE 0 END) AS full_product_count
+ SUM(CASE WHEN product_status.pending_stock_in_num > 0 THEN 1 ELSE 0 END) AS pending_product_count,
+ SUM(CASE WHEN product_status.approved_stock_in_num >= product_status.product_quantity THEN 1 ELSE 0 END) AS full_product_count,
+ MIN(CASE WHEN product_status.is_checked = 1 THEN 1 ELSE 0 END) AS all_need_quality_check
FROM (
SELECT
slp.id AS sales_ledger_product_id,
slp.sales_ledger_id,
IFNULL(slp.quantity, 0) AS product_quantity,
- IFNULL(approved_qty.approved_stock_in_num, 0) AS approved_stock_in_num
+ IFNULL(slp.is_checked, 0) AS is_checked,
+ IFNULL(approved_qty.approved_stock_in_num, 0) AS approved_stock_in_num,
+ IFNULL(approved_qty.pending_stock_in_num, 0) AS pending_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
+ IFNULL(SUM(rel.approved_stock_in_num), 0) AS approved_stock_in_num,
+ IFNULL(SUM(rel.pending_stock_in_num), 0) AS pending_stock_in_num
FROM (
SELECT slp.id AS sales_ledger_product_id,
- sir.stock_in_num
+ CASE WHEN COALESCE(sir.approval_status, 0) = 1 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS approved_stock_in_num,
+ CASE WHEN COALESCE(sir.approval_status, 0) = 0 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS pending_stock_in_num
FROM stock_in_record sir
INNER JOIN sales_ledger_product slp
ON slp.type = 2
@@ -75,12 +82,13 @@
(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
+ WHERE COALESCE(sir.approval_status, 0) IN (0, 1)
UNION ALL
SELECT slp.id AS sales_ledger_product_id,
- sir.stock_in_num
+ CASE WHEN COALESCE(sir.approval_status, 0) = 1 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS approved_stock_in_num,
+ CASE WHEN COALESCE(sir.approval_status, 0) = 0 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS pending_stock_in_num
FROM stock_in_record sir
INNER JOIN quality_inspect qi
ON TRIM(sir.record_type) = '10'
@@ -89,7 +97,7 @@
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
+ WHERE COALESCE(sir.approval_status, 0) IN (0, 1)
) rel
GROUP BY rel.sales_ledger_product_id
) approved_qty ON approved_qty.sales_ledger_product_id = slp.id
--
Gitblit v1.9.3