ERP_override.git

			@@ -255,7 +255,7 @@

			WHERE
			fc.process_id = #{processIdStr}
			<if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
			<if test="laminating != 'laminating'">
			AND POSITION(fc.technology_number in #{technologyStr})
			</if>
			AND odpd.process = #{process}
			@@ -993,11 +993,15 @@
			on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
			WHERE
			fc.process_id = #{processIdStr}
			<if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
			<if test="laminating != 'laminating' ">
			AND POSITION(fc.technology_number in #{technologyStr})
			</if>
			AND odpd.process = #{process}
			and rws.reviewed_state=0
			order by fc.order_number
			</select>

			<select id="getProcessLaminating">
			select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
			</select>
			</mapper>