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/sales/SalesLedgerProductMapper.xml | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index f9a5d1a..277b5a3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -44,6 +44,15 @@
(IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) as no_quantity,
IFNULL(t5.pending_approval_quantity, 0) as pending_approval_quantity,
CASE
+ WHEN T1.type != 2 THEN NULL
+ ELSE GREATEST(
+ IFNULL(T1.quantity, 0)
+ - IFNULL(t4.approved_stock_in_num, 0)
+ - IFNULL(t4.pending_stock_in_num, 0),
+ 0
+ )
+ END AS pending_inbound_quantity,
+ CASE
WHEN IFNULL(t3.shipped_quantity, 0) = 0 AND IFNULL(t5.pending_approval_quantity, 0) = 0 THEN '寰呭彂璐�'
WHEN IFNULL(t3.shipped_quantity, 0) = 0 AND IFNULL(t5.pending_approval_quantity, 0) > 0 THEN '瀹℃壒涓�'
WHEN (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) > 0 THEN '閮ㄥ垎鍙戣揣'
@@ -51,8 +60,8 @@
END as shippingStatus,
CASE
WHEN T1.type != 2 THEN NULL
- WHEN IFNULL(t4.approved_stock_in_num, 0) <= 0 THEN '寰呭叆搴�'
- WHEN IFNULL(t4.approved_stock_in_num, 0) >= IFNULL(T1.quantity, 0) THEN '瀹屽叏鍏ュ簱'
+ WHEN IFNULL(t4.approved_stock_in_num, 0) + IFNULL(t4.pending_stock_in_num, 0) <= 0 THEN '寰呭叆搴�'
+ WHEN IFNULL(t4.approved_stock_in_num, 0) + IFNULL(t4.pending_stock_in_num, 0) >= IFNULL(T1.quantity, 0) THEN '瀹屽叏鍏ュ簱'
ELSE '鍏ュ簱涓�'
END AS stock_in_approval_status
FROM
@@ -109,10 +118,12 @@
) 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
+ 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
@@ -122,12 +133,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'
@@ -136,7 +148,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
) t4 ON t4.sales_ledger_product_id = T1.id
@@ -156,6 +168,9 @@
<if test="salesLedgerProduct.type != null">
AND T1.type = #{salesLedgerProduct.type}
</if>
+ <if test="salesLedgerProduct.isChecked != null">
+ AND T1.is_checked = #{salesLedgerProduct.isChecked}
+ </if>
</where>
ORDER BY T1.register_date DESC
</select>
--
Gitblit v1.9.3