From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 61 +++---------------------------
1 files changed, 6 insertions(+), 55 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index a354cc6..2f782ff 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -100,22 +100,13 @@
sir.stock_in_num,
sir.batch_no,
slp.tax_inclusive_unit_price,
- GREATEST(
- sir.stock_in_num
- - COALESCE(rs.total_return_num, 0)
- - COALESCE(so.total_sale_out_num, 0),
- 0
- ) AS un_quantity,
- COALESCE(rs.total_return_num, 0) AS total_return_num,
- COALESCE(so.total_sale_out_num, 0) AS saleOutQuantity
+ GREATEST(sir.stock_in_num - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
+ COALESCE(rs.total_return_num, 0) AS total_return_num
FROM stock_in_record sir
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)
- LEFT JOIN sales_ledger_product slp
- ON pl.id = slp.sales_ledger_id
- AND slp.product_model_id = sir.product_model_id
- AND slp.type = 2
+ LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
LEFT JOIN (
SELECT
stock_in_record_id,
@@ -125,24 +116,7 @@
WHERE 1=1
GROUP BY stock_in_record_id
) rs ON rs.stock_in_record_id = sir.id
- LEFT JOIN (
- 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
- ) 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
+ WHERE sir.approval_status = 1 AND slp.type = 2
AND sir.record_type IN ('7','10')
and pl.id = #{purchaseLedgerId}
</select>
@@ -161,14 +135,8 @@
slp.tax_inclusive_unit_price,
prop.return_quantity,
prop.purchase_return_order_id,
- GREATEST(
- sir.stock_in_num
- - COALESCE(rs1.total_return_num1, 0)
- - COALESCE(so.total_sale_out_num, 0),
- 0
- ) AS un_quantity,
- COALESCE(rs.total_return_num, 0) AS total_return_num,
- COALESCE(so.total_sale_out_num, 0) AS saleOutQuantity
+ GREATEST(sir.stock_in_num - COALESCE(rs1.total_return_num1, 0), 0) AS un_quantity,
+ COALESCE(rs.total_return_num, 0) AS total_return_num
from purchase_return_order_products prop
left join purchase_return_orders pro on prop.purchase_return_order_id = pro.id
LEFT JOIN stock_in_record sir ON prop.stock_in_record_id = sir.id and sir.record_type in ('7','10')
@@ -183,23 +151,6 @@
FROM purchase_return_order_products
WHERE 1 = 1 and purchase_return_order_id = #{id}
GROUP BY stock_in_record_id) rs1 ON rs1.stock_in_record_id = sir.id
- LEFT JOIN (
- 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
- ) 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 pro.id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3