HangZhouMes.git

			@@ -41,7 +41,8 @@
			GROUP BY ENGINEER_ID, TEMPERING_LAYOUT_ID) T3 ON T2.ENGINEER_ID = T3.ENGINEER_ID
			AND T2.TEMPERING_LAYOUT_ID = T3.TEMPERING_LAYOUT_ID
			AND T2.COUNT = T3.COUNT
			ORDER BY T2.ENGINEER_ID, T2.TEMPERING_LAYOUT_ID
			INNER JOIN ENGINEERING T4 ON T2.ENGINEER_ID=T4.ENGINEER_ID
			ORDER BY T4.ID, T2.TEMPERING_LAYOUT_ID
			</select>

			<select id="queryTemperingOccupySlot" resultMap="temperingLayoutDTO">
			@@ -88,4 +89,13 @@
			)
			</where>
			</update>

			<select id="selectTemperingGlassCount" resultType="java.util.Map">
			select a.engineer_id,a.tempering_layout_id,count2,count1,count2-count1 as count3 from
			(select engineer_id,tempering_layout_id,count(*) as count1 from big_storage_cage_details where state=100 group by engineer_id,tempering_layout_id) as a
			left join
			(select engineer_id,tempering_layout_id,count(*) as count2 from glass_info group by engineer_id,tempering_layout_id) as b
			on a.engineer_id=b.engineer_id and a.tempering_layout_id=b.tempering_layout_id
			order by a.engineer_id,a.tempering_layout_id
			</select>
			</mapper>