From ff8920b4e676bcc82e069f6651740533cc60d0df Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 16 四月 2026 17:24:41 +0800
Subject: [PATCH] 扫码出入库联调
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 5 ++++-
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9db56f9..ebda2fc 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -66,12 +66,15 @@
pm.unit,
p.product_name
from stock_inventory si
- left join product_model pm on si.product_model_id = pm.id
+ left join product_model pm on si. = pm.id
left join product p on pm.product_id = p.id
where 1 = 1
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
+ <if test="ew.productModelId != null">
+ and si.product_model_id = #{ew.productModelId}
+ </if>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
select si.qualitity,
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index b171ae2..e043bd7 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -63,6 +63,9 @@
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
+ <if test="ew.productModelId != null">
+ and su.product_model_id = #{ew.productModelId}
+ </if>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
select su.*,
--
Gitblit v1.9.3