From ee156a360b75a0e54d34a56a67930893c84d0eab Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 15:01:13 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index e2e6277..074df74 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -33,7 +33,10 @@
WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >0 THEN 1
ELSE 0
END as has_sufficient_stock,
- (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) as no_quantity,
+ (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0) - IFNULL(t5.pending_approval_quantity, 0)) as no_quantity,
+ IFNULL(t3.shipped_quantity, 0) as shipped_quantity,
+ IFNULL(t6.return_quantity, 0) as return_quantity,
+ IFNULL(t4.approved_stock_in_num, 0) as approved_stock_in_num,
IFNULL(t5.pending_approval_quantity, 0) as pending_approval_quantity,
CASE
WHEN IFNULL(t3.shipped_quantity, 0) = 0 AND IFNULL(t5.pending_approval_quantity, 0) = 0 THEN '寰呭彂璐�'
@@ -55,11 +58,60 @@
GROUP BY 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
+ SELECT
+ slp.id AS sales_ledger_product_id,
+ IFNULL(SUM(so.total_sale_out_num), 0) AS shipped_quantity
+ FROM sales_ledger_product slp
+ LEFT JOIN (
+ SELECT
+ pl.id AS purchase_ledger_id,
+ sir.product_model_id,
+ SUM(spd.quantity) AS total_sale_out_num
+ FROM shipping_product_detail spd
+ INNER JOIN shipping_info si
+ ON si.id = spd.shipping_info_id
+ INNER JOIN stock_out_record sor
+ ON sor.record_id = si.id
+ AND TRIM(sor.record_type) = '13'
+ AND sor.approval_status IN (0, 1, 3)
+ INNER JOIN stock_inventory inv
+ ON inv.id = spd.stock_inventory_id
+ INNER JOIN stock_in_record sir
+ ON sir.product_model_id = inv.product_model_id
+ AND (
+ (sir.batch_no IS NOT NULL AND sir.batch_no = inv.batch_no)
+ OR (sir.batch_no IS NULL AND inv.batch_no IS NULL)
+ )
+ AND sir.approval_status = 1
+ AND sir.record_type IN ('7', '10')
+ LEFT JOIN quality_inspect qi
+ ON sir.record_type = '10'
+ AND sir.record_id = qi.id
+ LEFT JOIN purchase_ledger pl
+ ON pl.id = IF(sir.record_type = '7', sir.record_id, qi.purchase_ledger_id)
+ WHERE si.status IN ('瀹℃牳閫氳繃', '宸插彂璐�')
+ AND pl.id IS NOT NULL
+ GROUP BY pl.id, sir.product_model_id
+ ) so ON so.purchase_ledger_id = slp.sales_ledger_id
+ AND so.product_model_id = slp.product_model_id
+ WHERE slp.type = 2
+ GROUP BY slp.id
+
+ UNION ALL
+
+ -- 閿�鍞彴璐�(type=1): shipping_info 鐩存帴鎸� sales_ledger_product_id,鍙粺璁″嚭搴撳鏍搁�氳繃(approval_status=1)鐨勫彂璐ч噺,涓� t5 鐨� pending 閫昏緫浜掕ˉ
+ SELECT
+ si.sales_ledger_product_id AS sales_ledger_product_id,
+ IFNULL(SUM(spd.quantity), 0) AS shipped_quantity
FROM shipping_info si
- LEFT JOIN shipping_product_detail spd ON si.id = spd.shipping_info_id
- where si.status = '瀹℃牳閫氳繃' OR si.status = '宸插彂璐�'
- GROUP BY sales_ledger_product_id
+ INNER JOIN shipping_product_detail spd ON si.id = spd.shipping_info_id
+ INNER JOIN stock_out_record sor
+ ON sor.record_id = si.id
+ AND TRIM(sor.record_type) = '13'
+ AND sor.approval_status = 1
+ WHERE si.status IN ('瀹℃牳閫氳繃', '宸插彂璐�')
+ AND si.sales_ledger_product_id IS NOT NULL
+ GROUP BY si.sales_ledger_product_id
) t3 ON t3.sales_ledger_product_id = T1.id
LEFT JOIN (
SELECT rel.sales_ledger_product_id,
@@ -95,12 +147,27 @@
GROUP BY rel.sales_ledger_product_id
) t4 ON t4.sales_ledger_product_id = T1.id
LEFT JOIN (
- SELECT sales_ledger_product_id, IFNULL(SUM(spd.quantity), 0) as pending_approval_quantity
+ SELECT si.sales_ledger_product_id, IFNULL(SUM(spd.quantity), 0) as pending_approval_quantity
FROM shipping_info si
LEFT JOIN shipping_product_detail spd ON si.id = spd.shipping_info_id
WHERE si.status IN ('寰呭鏍�', '瀹℃牳涓�')
- GROUP BY sales_ledger_product_id
+ OR (si.status = '瀹℃牳閫氳繃' AND NOT EXISTS (
+ SELECT 1 FROM stock_out_record sor
+ WHERE sor.record_id = si.id
+ AND TRIM(sor.record_type) = '13'
+ AND sor.approval_status = 1
+ ))
+ GROUP BY si.sales_ledger_product_id
) t5 ON t5.sales_ledger_product_id = T1.id
+ LEFT JOIN (
+ SELECT
+ prop.sales_ledger_product_id,
+ IFNULL(SUM(prop.return_quantity), 0) AS return_quantity
+ FROM purchase_return_order_products prop
+ LEFT JOIN purchase_return_orders pro
+ ON pro.id = prop.purchase_return_order_id
+ GROUP BY prop.sales_ledger_product_id
+ ) t6 ON t6.sales_ledger_product_id = T1.id
left join product_model pm ON T1.product_model_id = pm.id
left join product p ON pm.product_id = p.id
<where>
--
Gitblit v1.9.3