From d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 22 五月 2026 11:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 55e57a3..5545c1e 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -93,7 +93,7 @@
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.product_id
+ LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
LEFT JOIN product_model pm ON sir.product_model_id = pm.id
LEFT JOIN product p ON pm.product_id = p.id
-- 鏉′欢
@@ -102,6 +102,9 @@
<if test="req.inboundBatches != null and req.inboundBatches != ''">
AND sir.inbound_batches LIKE CONCAT('%',#{req.inboundBatches},'%')
</if>
+ <if test="req.supplierId != null">
+ AND pl.supplier_id = #{req.supplierId}
+ </if>
<if test="req.supplierName != null and req.supplierName != ''">
AND pl.supplier_name LIKE CONCAT('%',#{req.supplierName},'%')
</if>
--
Gitblit v1.9.3