product-inventory-management-after.git

			@@ -16,17 +16,17 @@

			<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
			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
			@@ -39,6 +39,9 @@
			<if test="c.productModelId != null">
			and tr.product_model_id = #{c.productModelId}
			</if>
			<if test="c.model != null and c.model != ''">
			and pm.model like concat('%', #{c.model}, '%')
			</if>
			<if test="c.bomId != null">
			and tr.bom_id = #{c.bomId}
			</if>
			@@ -47,15 +50,6 @@
			</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>