YiWuProject.git

			@@ -32,6 +32,7 @@

			<resultMap id="temperingGlassCount" type="com.mes.bigstorage.entity.dto.TemperingGlassCountDTO">
			<result column="engineer_id" property="engineerId"/>
			<result column="engineer_name" property="engineerName"/>
			<result column="tempering_layout_id" property="temperingLayoutId"/>
			<result column="films_id" property="filmsId"/>
			<result column="thickness" property="thickness"/>
			@@ -166,9 +167,9 @@

			<select id="selectTemperingGlassCount" resultMap="temperingGlassCount">
			with glass_info_temp as (
			select engineer_id, tempering_layout_id, count(*) as total_count
			from glass_info
			group by engineer_id, tempering_layout_id
			select t.engineer_id,t1.engineer_name, t.tempering_layout_id, count(*) as total_count
			from glass_info t inner join engineering t1 on t.engineer_id=t1.engineer_id
			group by t.engineer_id, t.tempering_layout_id
			),
			big_details_temp as (
			select engineer_id, tempering_layout_id, count(*) as real_count, films_id, thickness
			@@ -191,6 +192,7 @@
			),
			result as (
			select t.engineer_id,
			t1.engineer_name,
			t.tempering_layout_id,
			t.films_id,
			t.thickness,
			@@ -306,7 +308,7 @@
			FROM big_storage_cage_details
			WHERE STATE = 100
			AND SLOT =
			(SELECT SLOT FROM big_storage_cage_details WHERE STATE = 100 AND sequence = 1 order by slot desc LIMIT 1)
			(SELECT SLOT FROM big_storage_cage_details WHERE STATE = 100 AND sequence = 1 AND device_id = 4 order by slot desc LIMIT 1)
			ORDER BY tempering_feed_sequence
			</select>