From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

---
 src/main/resources/mapper/production/ProcessRouteMapper.xml |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
new file mode 100644
index 0000000..51c11b4
--- /dev/null
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<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"/>
+    </resultMap>
+
+    <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
+        select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
+        from process_route 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
+        <where>
+            <if test="c.model != null and c.model != ''">
+                and pm.model like concat('%',#{c.model},'%')
+            </if>
+        </where>
+        order by ps.id asc
+    </select>
+</mapper>

--
Gitblit v1.9.3