From 8e7a3c666533bbfa7f35ab7d7c8638a54c9f31a7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 21 四月 2026 16:00:07 +0800
Subject: [PATCH] feat(production): 添加生产管理模块相关DTO、VO及控制器
---
src/main/resources/mapper/production/ProductStructureMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 1833487..920db52 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductStructure">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProductStructure">
<id property="id" column="id"/>
<result property="productModelId" column="product_model_id"/>
<result property="processId" column="process_id"/>
@@ -11,7 +11,7 @@
<result property="unit" column="unit"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
- <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listBybomId" resultType="com.ruoyi.production2.dto.ProductStructureDto">
select ps.*,
p.product_name,
pp.name as process_name,
@@ -25,7 +25,7 @@
where ps.bom_id = #{bomId}
order by ps.id
</select>
- <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listBybomAndProcess" resultType="com.ruoyi.production2.dto.ProductStructureDto">
select ps.*,
p.product_name,
pp.name as process_name,
@@ -33,11 +33,11 @@
pm.model
from
product_structure ps
- left join product_bom pb on ps.bom_id = pb.id
left join product_model pm on ps.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join product_process pp on ps.process_id = pp.id
- where pb.product_model_id = #{productModelId}
+ where ps.bom_id = #{bomId}
+ and ps.process_id=#{processId}
order by ps.id
</select>
</mapper>
--
Gitblit v1.9.3