YiWuProject.git

			@@ -59,6 +59,29 @@
			<result column="is_damage" property="isDamage"/>
			</resultMap>

			<select id="temperingIsAllByTemperingLayoutId" resultMap="temperingLayoutDTO">
			SELECT T.*
			FROM (
			SELECT ENGINEER_ID, TEMPERING_LAYOUT_ID, COUNT(distinct TEMPERING_FEED_SEQUENCE) AS COUNT
			FROM BIG_STORAGE_CAGE_DETAILS
			WHERE STATE = 100
			and ENGINEER_ID = #{engineerId}
			AND TEMPERING_LAYOUT_ID = #{temperingLayoutId}
			GROUP BY ENGINEER_ID, TEMPERING_LAYOUT_ID
			) T
			INNER JOIN (SELECT ENGINEER_ID,
			TEMPERING_LAYOUT_ID,
			COUNT(distinct TEMPERING_FEED_SEQUENCE) AS COUNT
			FROM GLASS_INFO
			WHERE ENGINEER_ID = #{engineerId}
			AND TEMPERING_LAYOUT_ID = #{temperingLayoutId}
			GROUP BY ENGINEER_ID,
			TEMPERING_LAYOUT_ID) T1
			ON T.ENGINEER_ID = T1.ENGINEER_ID
			AND T.TEMPERING_LAYOUT_ID = T1.TEMPERING_LAYOUT_ID
			AND T.COUNT = T1.COUNT
			</select>

			<select id="temperingIsAll" resultMap="temperingLayoutDTO">
			SELECT T2.*
			FROM (
			@@ -174,8 +197,8 @@
			total_count,
			real_count,
			ifnull(damage_count, 0) as damage_count,
			total_count - real_count - ifnull(damage_count, 0) as lack_count

			case when total_count - real_count - ifnull(damage_count, 0) < 0 then 0 else
			total_count - real_count - ifnull(damage_count, 0) end as lack_count
			from big_details_temp t
			inner join glass_info_temp t1 on t.engineer_id = t1.engineer_id and
			t.tempering_layout_id = t1.tempering_layout_id
			@@ -184,7 +207,7 @@
			)
			select *
			from result
			order by engineer_id
			order by engineer_id,tempering_layout_id
			</select>

			<select id="queryIsAllNeedDispatchVirtualSlot" resultMap="virtualSlotSequenceDTO">
			@@ -267,10 +290,11 @@
			FROM result
			</select>
			<select id="querybigStorageCageDetail" resultType="com.mes.base.entity.vo.BigStorageVO">
			SELECT SLOT, COUNT(1) AS COUNT
			FROM BIG_STORAGE_CAGE_DETAILS
			where state in (100, 102, 103, 104)
			group by SLOT
			ORDER BY SLOT
			select bsc.device_id, bsc.slot, count(bscd.glass_id) as count
			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
			order by bsc.device_id, bsc.slot
			</select>
			</mapper>