HangZhouMes.git

			@@ -13,6 +13,7 @@
			<result column="engineer_id" property="engineerId"/>
			<result column="tempering_layout_id" property="temperingLayoutId"/>
			<result column="slot" property="slot"/>
			<result column="glass_count" property="glassCount"/>
			<result column="max_sequence" property="maxSequence"/>
			<result column="min_sequence" property="minSequence"/>
			<result column="remain_width" property="remainWidth"/>
			@@ -51,7 +52,7 @@
			TEMPERING_LAYOUT_ID,
			COUNT(DISTINCT SLOT) as SLOT_COUNT
			FROM BIG_STORAGE_CAGE_DETAILS
			WHERE STATE = 100 AND TEMPERING_LAYOUT_ID!=0
			WHERE STATE = 100 AND TEMPERING_LAYOUT_ID!=0 AND THICKNESS < 8
			GROUP BY ENGINEER_ID,
			TEMPERING_LAYOUT_ID
			HAVING SLOT_COUNT >= #{count}
			@@ -64,6 +65,7 @@
			SELECT ENGINEER_ID,
			TEMPERING_LAYOUT_ID,
			SLOT,
			count(*) as glass_count,
			MAX(TEMPERING_FEED_SEQUENCE) AS MAX_SEQUENCE,
			MIN(TEMPERING_FEED_SEQUENCE) AS MIN_SEQUENCE
			FROM BIG_STORAGE_CAGE_DETAILS
			@@ -94,8 +96,8 @@
			</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 and tempering_layout_id!=0 group by engineer_id,tempering_layout_id) as a
			select a.engineer_id,a.tempering_layout_id,count2,count1,count2-count1 as count3,count(c.glass_id) as count4,slots from
			(select engineer_id,tempering_layout_id,count(*) as count1,group_concat(distinct slot order by tempering_feed_sequence) as slots 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