From f9b26d13f0a43f0bb5c8140a2de3ebd8d9c9c8d8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 12 九月 2026 11:56:34 +0800
Subject: [PATCH] fix: 产品导入去重
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 23cad89..4f65112 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -74,8 +74,6 @@
(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
-
UNION ALL
SELECT slp.id AS sales_ledger_product_id,
@@ -88,12 +86,16 @@
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
) rel
GROUP BY rel.sales_ledger_product_id
) t4 ON t4.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
+ LEFT JOIN (
+ SELECT product_model_id, MAX(create_time) AS last_stock_in_time
+ FROM stock_in_record
+ GROUP BY product_model_id
+ ) t5 ON t5.product_model_id = T1.product_model_id
<where>
<if test="salesLedgerProduct.salesLedgerId != null">
AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}
@@ -102,7 +104,7 @@
AND T1.type = #{salesLedgerProduct.type}
</if>
</where>
- ORDER BY T1.register_date DESC
+ ORDER BY t5.last_stock_in_time DESC, T1.id DESC
</select>
<select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
--
Gitblit v1.9.3