YiWuProject.git

			@@ -296,11 +296,11 @@
			FROM result
			</select>
			<select id="querybigStorageCageDetail" resultType="com.mes.base.entity.vo.BigStorageVO">
			select bsc.device_id, bsc.slot, count(bscd.glass_id) as count
			select bsc.device_id, bsc.slot,bscd.glass_id,if(bscd.width>bscd.height,bscd.width,bscd.height) as length
			from big_storage_cage bsc
			left join big_storage_cage_details bscd
			on bsc.slot = bscd.slot and bscd.state in (100, 102, 103, 104)
			group by bsc.device_id, bsc.slot
			left join big_storage_cage_details bscd
			on bsc.slot = bscd.slot and bscd.state in (100, 102, 103, 104)
			group by bsc.device_id, bsc.slot,bscd.glass_id
			order by bsc.device_id, bsc.slot
			</select>
			<select id="queryNeedDispatch" resultType="com.mes.bigstorage.entity.BigStorageCageDetails">
			@@ -308,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>