From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/technology/TechnologyRoutingMapper.xml | 67 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
index fcf2890..231905b 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
@@ -2,19 +2,66 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.technology.mapper.TechnologyRoutingMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.technology.pojo.TechnologyRouting">
- <id column="id" property="id" />
- <result column="product_model_id" property="productModelId" />
- <result column="description" property="description" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="process_route_code" property="processRouteCode" />
- <result column="bom_id" property="bomId" />
- <result column="create_user" property="createUser" />
- <result column="dept_id" property="deptId" />
+ <id column="id" property="id"/>
+ <result column="product_model_id" property="productModelId"/>
+ <result column="description" property="description"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="process_route_code" property="processRouteCode"/>
+ <result column="bom_id" property="bomId"/>
+ <result column="create_user" property="createUser"/>
+ <result column="dept_id" property="deptId"/>
</resultMap>
+ <select id="pageTechnologyRouting" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingVo">
+ select tr.id,
+ tr.product_model_id as productModelId,
+ tr.description,
+ tr.create_time as createTime,
+ tr.update_time as updateTime,
+ tr.process_route_code as processRouteCode,
+ tr.bom_id as bomId,
+ tr.create_user as createUser,
+ tr.dept_id as deptId,
+ p.product_name as productName,
+ pm.model,
+ tb.bom_no as bomNo
+ from technology_routing tr
+ left join product_model pm on tr.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_bom tb on tr.bom_id = tb.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and tr.id = #{c.id}
+ </if>
+ <if test="c.productModelId != null">
+ and tr.product_model_id = #{c.productModelId}
+ </if>
+ <if test="c.bomId != null">
+ and tr.bom_id = #{c.bomId}
+ </if>
+ <if test="c.processRouteCode != null and c.processRouteCode != ''">
+ and tr.process_route_code like concat('%', #{c.processRouteCode}, '%')
+ </if>
+ <if test="c.description != null and c.description != ''">
+ and tr.description like concat('%', #{c.description}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.bomNo != null and c.bomNo != ''">
+ and tb.bom_no like concat('%', #{c.bomNo}, '%')
+ </if>
+ </if>
+ </where>
+ order by tr.id desc
+ </select>
+
<update id="updateProductModelByBomId">
update technology_routing
set product_model_id = #{productModelId}
--
Gitblit v1.9.3