From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..d8395ea 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,12 +9,22 @@
<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" />
+ <result column="product_code" property="productCode" />
+ <result column="barcode" property="barcode" />
</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
@@ -22,11 +32,39 @@
<if test="c.model != null and c.model != ''">
and pm.model like concat('%',#{c.model},'%')
</if>
+ <if test="c.barcode != null and c.barcode != ''">
+ and pm.barcode like concat('%',#{c.barcode},'%')
+ </if>
<if test="c.productName != null and c.productName != ''">
and p.product_name like concat('%',#{c.productName},'%')
</if>
+ <if test="c.topProductParentId != null and c.topProductParentId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ 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
+ )
+ select id from product_tree
+ )
+ </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
@@ -107,4 +145,4 @@
order by p.id,pm.id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3