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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 6270b1d..5d73858 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -16,6 +16,7 @@
<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}"
@@ -23,9 +24,20 @@
</resultMap>
<select id="listPageProductModel" resultMap="ProductModelVoResultMap">
- select pm.*,p.product_name
+ 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},'%')
@@ -134,7 +146,9 @@
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
--
Gitblit v1.9.3