From 099e8a366eb8e69601371229d4ff4acad725e463 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 二月 2026 15:47:57 +0800
Subject: [PATCH] feat(product): 添加产品列表查询功能
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 79b08cd..05e8558 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -64,13 +64,21 @@
pm.model,
si.remark,
pm.unit,
- p.product_name
+ p.product_name,
+ pm.url,
+ pm.height,
+ pm.box_num,
+ pm. dollar_price,
+ pm.tax_inclusive_unit_price
from stock_inventory si
left join product_model pm on si.product_model_id = 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.parentId != null">
+ and p.parent_id = #{ew.parentId}
</if>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -91,15 +99,17 @@
</if>
</select>
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
- select sir.*,si.qualitity,
+ select sir.*,si.qualitity as current_stock,
pm.model,
pm.unit,
- p.product_name
+ p.product_name,
+ su.nick_name as create_by
from
stock_in_record sir
left join stock_inventory si on sir.product_model_id = si.product_model_id
left join product_model pm on sir.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join sys_user su on sir.create_user = su.user_id
<where>
<if test="ew.reportDate != null">
and sir.create_time >= #{ew.reportDate}
--
Gitblit v1.9.3