HangZhouMes.git

			@@ -78,7 +78,7 @@
			from sd.order_glass_detail as ogd
			where ogd.order_id = left (#{processId}
			, 10)
			and position (ogd.technology_number in #{technologyNumber})
			and position(ogd.technology_number in #{technologyNumber})
			GROUP BY order_id, order_number) as ogdc
			on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
			ogdc.technology_number = ogd.technology_number
			@@ -89,7 +89,7 @@

			<select id="selectLabel" resultType="java.util.Map">
			select fc.process_id,
			od.remarks as order_id,
			o.order_id,
			o.project,
			o.customer_id,
			ogd.child_width as width,
			@@ -117,11 +117,15 @@
			left join sd.basic_glass_type bgt on bgt.type_id = pt.type_id
			where fc.process_id in (
			<foreach collection="processId" item="item" separator=",">
			#{item}
			#{item}
			</foreach>
			)
			and fc.technology_number in (
			<foreach collection="technologyNumber" item="items" separator=",">
			#{items}
			</foreach>
			)
			and fc.technology_number = #{technologyNumber}
			group by od.order_number, od.width, od.height
			group by fc.process_id, fc.technology_number, od.order_number, od.width, od.height
			</select>