~admin/HangZhouMes.git

			@@ -29,6 +29,8 @@
			LEFT JOIN DAMAGE T1
			ON T.ENGINEER_ID = T1.ENGINEER_ID
			AND T.GLASS_ID = T1.GLASS_ID
			AND (T1.TYPE = 8
			OR T1.TYPE = 9 )
			WHERE
			T1.GLASS_ID IS NULL
			GROUP BY
			@@ -37,10 +39,12 @@
			) T2
			INNER JOIN (SELECT ENGINEER_ID, TEMPERING_LAYOUT_ID, COUNT(TEMPERING_FEED_SEQUENCE) AS COUNT
			FROM BIG_STORAGE_CAGE_DETAILS
			WHERE STATE in (100, 101, 102, 103)
			WHERE STATE in (100)
			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
			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">
			@@ -87,4 +91,15 @@
			)
			</where>
			</update>

			<select id="selectTemperingGlassCount" resultType="java.util.Map">
			select a.engineer_id,a.tempering_layout_id,count2,count1,count2-count1 as count3,count(c.glass_id) as count4 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
			left join damage as c on a.engineer_id=c.engineer_id and a.tempering_layout_id=c.tempering_layout_id and (type = 8 or type = 9)
			group by a.engineer_id,a.tempering_layout_id
			order by a.engineer_id,a.tempering_layout_id
			</select>
			</mapper>