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/purchase/PurchaseReturnOrdersMapper.xml | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 8ca4903..fa6d51f 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -145,20 +145,43 @@
GROUP BY stock_in_record_id
) rs ON rs.stock_in_record_id = sir.id
LEFT JOIN (
+ <!-- 宸查攢鍞暟閲忥細鈶� 鎵嬪伐鍙戣揣鍗曞嚭搴撲粛璧� shipping_product_detail锛�
+ 鈶� 娌瑰搧鍑哄簱涓嶅啀浜� shipping_product_detail锛屾敼鎸夈�屽嚭搴撳崟鐨勮鏍�+鎵规銆嶅涓婇噰璐叆搴撴壒娆★紝
+ 姹囨�荤粦瀹氳鐨勫垎鎽婃暟閲忥紙涓�涓嚭搴撳崟缁戝涓彴璐︽椂锛岀粦瀹氳鏁伴噺涔嬪拰=鏁村崟鍑哄簱閲忥級 -->
SELECT
- inv.batch_no,
- inv.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 sor.record_type = '13'
- AND sor.approval_status IN (0, 1, 3)
- INNER JOIN stock_inventory inv
- ON inv.id = spd.stock_inventory_id
- GROUP BY inv.batch_no, inv.product_model_id
+ x.batch_no,
+ x.product_model_id,
+ SUM(x.total_sale_out_num) AS total_sale_out_num
+ FROM (
+ SELECT
+ inv.batch_no,
+ inv.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 sor.record_type = '13'
+ AND sor.approval_status IN (0, 1, 3)
+ INNER JOIN stock_inventory inv
+ ON inv.id = spd.stock_inventory_id
+ GROUP BY inv.batch_no, inv.product_model_id
+
+ UNION ALL
+
+ SELECT
+ sor.batch_no,
+ sor.product_model_id,
+ SUM(b.quantity) AS total_sale_out_num
+ 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, 1, 3)
+ AND (sor.type IS NULL OR sor.type = '')
+ GROUP BY sor.batch_no, sor.product_model_id
+ ) x
+ GROUP BY x.batch_no, x.product_model_id
) so ON so.product_model_id = sir.product_model_id
AND (so.batch_no = sir.batch_no OR (so.batch_no IS NULL AND sir.batch_no IS NULL))
WHERE sir.approval_status = 1
--
Gitblit v1.9.3