HangZhouMes.git

			@@ -46,17 +46,16 @@
			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">
			SELECT ENGINEER_ID,
			TEMPERING_LAYOUT_ID,
			COUNT(DISTINCT SLOT) as SLOT_COUNT
			FROM BIG_STORAGE_CAGE_DETAILS
			WHERE STATE = 100
			WHERE STATE = 100 AND TEMPERING_LAYOUT_ID!=0
			GROUP BY ENGINEER_ID,
			TEMPERING_LAYOUT_ID
			HAVING SLOT_COUNT >= #{count}
			ORDER BY SLOT_COUNT DESC
			ORDER BY ID DESC
			</select>
			<select id="queryGlassMaxAndMin" resultMap="slotSequenceDTO">
			SELECT T.*,
			@@ -70,6 +69,7 @@
			FROM BIG_STORAGE_CAGE_DETAILS
			WHERE ENGINEER_ID = #{engineerId}
			AND TEMPERING_LAYOUT_ID = #{temperingLayoutId}
			AND STATE = 100
			GROUP BY ENGINEER_ID,
			TEMPERING_LAYOUT_ID,
			SLOT
			@@ -89,12 +89,13 @@
			(#{item.glassId}, #{item.targetSlot})
			</foreach>
			)
			and state!=101
			</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
			(select engineer_id,tempering_layout_id,count(*) as count1 from big_storage_cage_details where state=100 and tempering_layout_id!=0 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