From 26a8cbc31f2d739a91e3fa7e75114e360bcaee0d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 22 五月 2026 10:01:46 +0800
Subject: [PATCH] 发货信息返回产品名称，规格，单位
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 4ae5508..6270b1d 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,12 +9,20 @@
<result column="product_id" property="productId" />
<result column="model" property="model" />
<result column="unit" property="unit" />
- <result column="speculative_trading_name" property="speculativeTradingName" />
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
</resultMap>
- <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
+
+ <resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
+ <result column="create_time" property="createTime" />
+ <collection property="batchNoList"
+ ofType="java.lang.String"
+ column="{productModelId=id}"
+ select="selectBatchNoListByProductModelId"/>
+ </resultMap>
+
+ <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
select pm.*,p.product_name
from product_model pm
left join product p on pm.product_id = p.id
@@ -31,9 +39,9 @@
SELECT id
FROM product
WHERE id = #{c.topProductParentId}
-
+
UNION ALL
-
+
SELECT p.id
FROM product p
INNER JOIN product_tree pt ON p.parent_id = pt.id
@@ -43,6 +51,15 @@
</if>
</where>
order by pm.id
+ </select>
+
+ <select id="selectBatchNoListByProductModelId" resultType="java.lang.String">
+ select distinct si.batch_no
+ from stock_inventory si
+ where si.product_model_id = #{productModelId}
+ and si.batch_no is not null
+ and si.batch_no != ''
+ order by si.batch_no
</select>
<select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
SELECT * FROM product_model
@@ -123,4 +140,4 @@
order by p.id,pm.id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3