From 71af682447e953e309cc953e65a5f32cc24998b2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 17:04:56 +0800
Subject: [PATCH] feat: 生产下发时(砌块、板材)绑定最新的工艺路线到附表、删除生产订单时清除所有附表数据
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 7caa0be..1baf536 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -3,14 +3,50 @@
<mapper namespace="com.ruoyi.production.mapper.ProcessRouteMapper">
+ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="description" column="description"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="status" column="status"/>
+ </resultMap>
+
+
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_name
+ select
+ ps.*,
+ pb.bom_no,
+ sdd.dict_label AS dictLabel
from process_route ps
- left join product_model pm on ps.product_model_id = pm.id
- <where>
- <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
- and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
- </if>
- </where>
+ left join product_bom pb on ps.bom_id = pb.id
+ left join sys_dict_data sdd on sdd.dict_code = ps.dict_code
+ where 1= 1
+ <if test="c.dictCode != null">
+ and ps.dict_code = #{c.dictCode}
+ </if>
+ order by ps.id
</select>
+
+ <select id="latestTypeDate" resultType="com.ruoyi.production.pojo.ProcessRoute">
+ SELECT *
+ FROM process_route pr
+ WHERE pr.dict_code = (SELECT d.dict_code
+ FROM sys_dict_data d
+ WHERE d.dict_label =
+ <choose>
+ <when test="strength != null and strength != ''">
+ CONCAT(#{productName}, '-', #{strength})
+ </when>
+ <otherwise>
+ #{productName}
+ </otherwise>
+ </choose>
+ AND d.dict_type = 'product_type'
+ LIMIT 1)
+ ORDER BY pr.create_time DESC
+ LIMIT 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3