From c7e7ed6d05cd1586b37396bcabc9f3f7e6ec589f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 21 十月 2026 16:08:51 +0800
Subject: [PATCH] feat(销售台账/产品维护): 图号必填唯一、合同号唯一、明细产品编码与导入物料编码
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..5d73858 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,15 +9,35 @@
<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">
- select pm.*,p.product_name
+
+ <resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
+ <result column="create_time" property="createTime" />
+ <result column="top_product_name" property="topProductName" />
+ <collection property="batchNoList"
+ ofType="java.lang.String"
+ column="{productModelId=id}"
+ select="selectBatchNoListByProductModelId"/>
+ </resultMap>
+
+ <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
+ WITH RECURSIVE product_root AS (
+ SELECT id, parent_id, product_name
+ FROM product
+ WHERE parent_id IS NULL
+ UNION ALL
+ SELECT p.id, p.parent_id, pr.product_name
+ FROM product p
+ INNER JOIN product_root pr ON p.parent_id = pr.id
+ )
+ select pm.*, p.product_name,
+ pr.product_name as top_product_name
from product_model pm
left join product p on pm.product_id = p.id
+ left join product_root pr on p.id = pr.id
<where>
<if test="c.model != null and c.model != ''">
and pm.model like concat('%',#{c.model},'%')
@@ -25,8 +45,33 @@
<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
@@ -101,10 +146,12 @@
select p.id as id,
pm.id as modelId,
p.product_name as productName ,
- pm.model as model
+ pm.model as model,
+ pm.product_code as productCode,
+ pm.drawing_no as drawingNo
from product_model pm
left join product p on p.id = pm.product_id
order by p.id,pm.id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3