From d6388d041cc58b9f2be3ddcddfb6042e7af094f7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 10:11:00 +0800
Subject: [PATCH] fix(stock): 修复库存盘点计划中的出入库记录类型错误
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 4ae5508..bd388fb 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -14,7 +14,16 @@
<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 +40,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 +52,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
@@ -122,5 +140,18 @@
left join product p on p.id = pm.product_id
order by p.id,pm.id desc
</select>
+ <select id="selectModelByIds" resultType="com.ruoyi.basic.dto.ProductModelDto">
+ select pm.model,p.product_name,pm.unit
+ from product_model pm
+ left join product p on pm.product_id = p.id
+ <where>
+ <if test="list != null and list.size() > 0">
+ and pm.id in
+ <foreach item="item" collection="list" separator="," open="(" close=")" index="index">
+ #{item}
+ </foreach>
+ </if>
+ </where>
+ </select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3