HangZhouMes.git

			@@ -13,11 +13,10 @@
			<result column="state" property="state"/>
			<result column="group_number" property="groupNumber"/>
			</resultMap>
			<select id="queryRawGlassByEngineeringId" resultType="com.mes.uppattenusage.entity.vo.UpPattenUsageVO">
			<select id="queryRawGlassByEngineeringId" resultMap="baseMap">
			SET @prev_width := NULL;
			SET @prev_height := NULL;
			SET @counter := 0;

			SELECT t.*,
			@counter := IF(@prev_width = width and @prev_height = height, @counter, @counter + 1) AS group_number,
			@prev_width := width,
			@@ -27,6 +26,14 @@
			and t.state = 0
			ORDER BY t.layout_sequence
			</select>
			<select id="queryFinishByEngineering" resultType="java.lang.Integer">
			SELECT id
			FROM up_patten_usage
			WHERE engineering_id IN (SELECT engineer_id FROM engineering WHERE station_cell = #{stationCell} AND state = 1)
			and state = 0
			order by id
			LIMIT ${finishCount}
			</select>


			</mapper>