From 7bf754a7835d06f26240c4ca15bc5f83650de377 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 21 九月 2026 20:52:25 +0800
Subject: [PATCH] docs(api): 更新信托基金与代储台账及油品出库相关接口文档
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 9e6839f..5f319a3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -63,24 +63,22 @@
IFNULL(SUM(so.total_sale_out_num), 0) AS shipped_quantity
FROM sales_ledger_product slp
LEFT JOIN (
+ -- 閲囪喘鍙拌处鐨勩�屽凡閿�鍞暟閲忋�嶏細娌瑰搧鍑哄簱涓嶅啀浜� shipping_product_detail锛�
+ -- 鏀圭敱缁戝畾琛岀殑鍒嗘憡鏁伴噺鍙嶆帹 鈥斺�� 鍑哄簱鍗曠殑 瑙勬牸+鎵规 瀵逛笂閲囪喘鍏ュ簱鎵规锛屽嵆涓鸿閲囪喘鍙拌处鍗栨帀鐨勯噺
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
+ SUM(b.quantity) AS total_sale_out_num
+ FROM stock_out_record_sales_ledger b
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
+ ON sor.id = b.stock_out_record_id
+ AND sor.approval_status = 1
+ AND (sor.type IS NULL OR sor.type = '')
INNER JOIN stock_in_record sir
- ON sir.product_model_id = inv.product_model_id
+ ON sir.product_model_id = sor.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)
+ (sir.batch_no IS NOT NULL AND sir.batch_no = sor.batch_no)
+ OR (sir.batch_no IS NULL AND sor.batch_no IS NULL)
)
AND sir.approval_status = 1
AND sir.record_type IN ('7', '10')
@@ -89,8 +87,7 @@
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
+ WHERE 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
@@ -99,19 +96,14 @@
UNION ALL
- -- 閿�鍞彴璐�(type=1): shipping_info 鐩存帴鎸� sales_ledger_product_id,鍙粺璁″嚭搴撳鏍搁�氳繃(approval_status=1)鐨勫彂璐ч噺,涓� t5 鐨� pending 閫昏緫浜掕ˉ
+ -- 閿�鍞彴璐�(type=1): 宸插彂璐ч噺鐩存帴鎸夊埌璐ц褰曟眹鎬汇�傚埌璐ц褰曟湰韬氨鏄�屽疄闄呭埌浜嗗灏戙�嶇殑浜嬪疄锛�
+ -- 涓嶅啀缁� shipping_info + shipping_product_detail
SELECT
- si.sales_ledger_product_id AS sales_ledger_product_id,
- IFNULL(SUM(spd.quantity), 0) AS shipped_quantity
- FROM shipping_info si
- 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
+ sla.sales_ledger_product_id AS sales_ledger_product_id,
+ IFNULL(SUM(sla.arrival_quantity), 0) AS shipped_quantity
+ FROM sales_ledger_arrival sla
+ WHERE sla.sales_ledger_product_id IS NOT NULL
+ GROUP BY sla.sales_ledger_product_id
) t3 ON t3.sales_ledger_product_id = T1.id
LEFT JOIN (
SELECT rel.sales_ledger_product_id,
@@ -158,6 +150,20 @@
AND sor.approval_status = 1
))
GROUP BY si.sales_ledger_product_id
+
+ UNION ALL
+
+ -- 娌瑰搧鍑哄簱寰呭鎵� / 寰呯‘璁わ細杩樻病鍒拌揣锛岀畻銆屽鎵逛腑銆嶏紝涓� t3 鐨勫埌璐ч噺浜掕ˉ銆�
+ -- 鍙湁缁戝畾浜嗗崠娌瑰彴璐︾殑鍑哄簱鎵嶅崰杩欐潯鍒嗘敮锛堜唬鍌ㄣ�佸瀛樹笉浜х粦瀹氳锛�
+ SELECT b.sales_ledger_product_id AS sales_ledger_product_id,
+ IFNULL(SUM(b.quantity), 0) AS pending_approval_quantity
+ FROM stock_out_record_sales_ledger b
+ INNER JOIN stock_out_record sor
+ ON sor.id = b.stock_out_record_id
+ AND sor.approval_status IN (0, 3)
+ AND (sor.type IS NULL OR sor.type = '')
+ WHERE b.sales_ledger_product_id IS NOT NULL
+ GROUP BY b.sales_ledger_product_id
) t5 ON t5.sales_ledger_product_id = T1.id
LEFT JOIN (
SELECT
--
Gitblit v1.9.3