~zhoushihao/YiWuProject.git

			@@ -288,7 +288,7 @@
			//是否有正在钢化的玻璃:钢化小片表关联历史任务表，筛选未出笼的玻璃信息
			// 获取当前钢化任务未完成出片的玻璃信息
			List<TemperingGlassInfo> unFinishTemperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW).orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW).orderByAsc(TemperingGlassInfo::getTemperingLayoutId).orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
			if (CollectionUtil.isNotEmpty(unFinishTemperingGlassInfoList)) {
			log.info("有正在出片的钢化任务");
			computeOutGlassInfoByVirtualSlot(unFinishTemperingGlassInfoList, "big_storage_cage_out_one_task", temperingOutTargetPosition, Const.GLASS_STATE_OUT_ING, Const.BIG_STORAGE_BEFORE_OUT);
			@@ -318,9 +318,9 @@
			for (TemperingLayoutDTO item : temperingLayoutDTOList) {
			// if (item.getEngineerId().equals(redisUtil.getCacheObject("temperingengineerId"))) {
			List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
			.selectAll(GlassInfo.class)
			.select("-1 as state")
			.selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
			.select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.glass_type,t.width,t.height" +
			",t.thickness,t.ishorizontal,t.tempering_layout_id,t.tempering_feed_sequence,t.x_coordinate,t.y_coordinate," +
			"t.angle,t1.slot,t.engineer_id")
			.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId())