From be241f4251668ba0dd1d3d6d1176bc3bbe8d7ff6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 14:00:45 +0800
Subject: [PATCH] 修改可入库数量的计算
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 80 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index e2e6277..14908a2 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -14,11 +14,14 @@
T1.tax_rate,
T1.tax_inclusive_unit_price,
T1.tax_inclusive_total_price,
+ T1.freight_unit_price,
+ T1.total_freight,
T1.tax_exclusive_total_price,
T1.invoice_type,
T1.type,
T1.product_id,
T1.product_model_id,
+ T1.stock_type,
T1.register,
T1.register_date,
T1.approve_status,
@@ -30,11 +33,25 @@
pm.model as specification_model,
pm.unit as unit,
CASE
- WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >0 THEN 1
+ WHEN IFNULL(
+ CASE
+ WHEN T1.stock_type = 'waste' THEN t2.waste_available_quantity
+ ELSE t2.qualified_available_quantity
+ END, 0
+ ) >= (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) THEN 1
ELSE 0
END as has_sufficient_stock,
(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 '瀹℃壒涓�'
@@ -43,16 +60,54 @@
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
sales_ledger_product T1
LEFT JOIN (
- SELECT product_model_id, SUM(qualitity) as qualitity, SUM(locked_quantity) as locked_quantity
- FROM stock_inventory
- GROUP BY product_model_id
+ SELECT
+ t.product_model_id,
+ SUM(t.qualified_available_quantity) as qualified_available_quantity,
+ SUM(t.waste_available_quantity) as waste_available_quantity
+ FROM (
+ SELECT
+ si.product_model_id,
+ (IFNULL(si.qualitity, 0) - IFNULL(si.locked_quantity, 0) - IFNULL((
+ SELECT SUM(sor.stock_out_num)
+ FROM stock_out_record sor
+ WHERE sor.product_model_id = si.product_model_id
+ AND (
+ (si.batch_no IS NULL AND sor.batch_no IS NULL)
+ OR si.batch_no = sor.batch_no
+ )
+ AND sor.type = '0'
+ AND sor.approval_status IN (0, 3)
+ ), 0)) as qualified_available_quantity,
+ 0 as waste_available_quantity
+ FROM stock_inventory si
+
+ UNION ALL
+
+ SELECT
+ su.product_model_id,
+ 0 as qualified_available_quantity,
+ (IFNULL(su.qualitity, 0) - IFNULL(su.locked_quantity, 0) - IFNULL((
+ SELECT SUM(sor.stock_out_num)
+ FROM stock_out_record sor
+ WHERE sor.product_model_id = su.product_model_id
+ AND (
+ (su.batch_no IS NULL AND sor.batch_no IS NULL)
+ OR su.batch_no = sor.batch_no
+ )
+ AND sor.type = '1'
+ AND sor.approval_status IN (0, 3)
+ ), 0)) as waste_available_quantity
+ FROM stock_uninventory su
+ WHERE COALESCE(su.type, 'unqualified') = 'waste'
+ ) t
+ GROUP BY t.product_model_id
) t2 ON T1.product_model_id = t2.product_model_id
LEFT JOIN (
SELECT sales_ledger_product_id, IFNULL(SUM(spd.quantity), 0) as shipped_quantity
@@ -63,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
@@ -76,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'
@@ -90,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
--
Gitblit v1.9.3