~zhoushihao/YiWuProject.git

			@@ -141,7 +141,7 @@
			}
			}
			List<HollowBigStorageCageDetails> detailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, glassIdList)
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
			if (CollectionUtil.isNotEmpty(detailsList)) {
			log.info("理片笼存在相同的进片玻璃{}，结束本次任务", detailsList);
			//todo:向plc发送报警
			@@ -162,6 +162,7 @@

			//计算目标格子
			List<HollowBigStorageCageHistoryTask> historyTasks = new ArrayList<>();
			try {
			for (BigStorageCageTask task : inTaskList) {
			GlassInfo info = glassListMap.get(task.getGlassId()).get(0);
			HollowBigStorageDTO bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(),
			@@ -194,11 +195,23 @@
			.set(HollowGlassRelationInfo::getTemperingLayoutId, cageDetails.getTemperingLayoutId())
			.set(HollowGlassRelationInfo::getTemperingFeedSequence, cageDetails.getTemperingFeedSequence())
			.set(HollowGlassRelationInfo::getEngineerId, cageDetails.getEngineerId())
			.set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
			.eq(HollowGlassRelationInfo::getFlowCardId, bigStorageDTO.getFlowCardId())
			.eq(HollowGlassRelationInfo::getLayer, bigStorageDTO.getLayer())
			.eq(HollowGlassRelationInfo::getVirtualSlot, bigStorageDTO.getVirtualSlot())
			.eq(HollowGlassRelationInfo::getSlotSequence, bigStorageDTO.getSlotSequence())
			.eq(HollowGlassRelationInfo::getHollowSequence, bigStorageDTO.getHollowSequence())
			);
			}
			} catch (Exception exception) {
			log.info("进片任务执行中发生异常：{}", exception);
			hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
			.set(HollowGlassRelationInfo::getGlassId, null)
			.set(HollowGlassRelationInfo::getTemperingLayoutId, null)
			.set(HollowGlassRelationInfo::getTemperingFeedSequence, null)
			.set(HollowGlassRelationInfo::getEngineerId, null)
			.set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW)
			.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
			);
			}
			//历史数据入库
			@@ -440,12 +453,38 @@
			hollowBigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_IN);
			log.info("4、大理片笼进片状态已完成已完成的玻璃信息id:{}", v);
			updateSlotRemainBySlots(inSuccessGlassSlot);
			List<String> glassList = v.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
			hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
			.set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_SUCCESS)
			.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
			.in(HollowGlassRelationInfo::getGlassId, glassList)
			);
			} else if (e1 == 3) {
			//破损处理
			dealDamageInTask(v);
			List<String> glassList = v.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
			hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
			.set(HollowGlassRelationInfo::getGlassId, null)
			.set(HollowGlassRelationInfo::getTemperingLayoutId, null)
			.set(HollowGlassRelationInfo::getTemperingFeedSequence, null)
			.set(HollowGlassRelationInfo::getEngineerId, null)
			.set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW)
			.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
			.in(HollowGlassRelationInfo::getGlassId, glassList)
			);
			} else {
			//清空理片笼空数据
			noDealInTask(v);
			List<String> glassList = v.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
			hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
			.set(HollowGlassRelationInfo::getGlassId, null)
			.set(HollowGlassRelationInfo::getTemperingLayoutId, null)
			.set(HollowGlassRelationInfo::getTemperingFeedSequence, null)
			.set(HollowGlassRelationInfo::getEngineerId, null)
			.set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW)
			.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
			.in(HollowGlassRelationInfo::getGlassId, glassList)
			);
			}
			});
			for (BigStorageCageTask item : inTaskList) {
			@@ -718,12 +757,17 @@
			if (isPair == 0 && isForce!=1) {
			taskType = Const.BIG_STORAGE_AFTER_DISPATCH;
			taskState = Const.GLASS_STATE_SCHEDULE_ING;
			resultList.add(list.get(0));
			//目前调度任务totalLayer为0 出片调度任务有层号，用于区分调度方式
			// 因为出片存在调度，如果为调度，提前占用格子，更新格子剩余尺寸，避免被进片玻璃占用
			if (totalLayer !=0){
			resultList.add(list.get(0));
			HollowBigStorageCage storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
			.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1"));
			targetSlot = storageCage.getSlot();
			hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
			.set(HollowBigStorageCage::getRemainWidth, 0).eq(HollowBigStorageCage::getSlot, targetSlot));
			}else{
			resultList = tempList;
			}
			totalLayer = 0;
			}else{
			@@ -810,6 +854,9 @@
			//是否存在有格子非空的玻璃
			if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
			//存在将格子内的玻璃分别进行更新
			// List<HollowBigStorageCage> hollowBigStorageCageList = hollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>()
			// .lt(HollowBigStorageCage::getRemainWidth, 0).in(HollowBigStorageCage::getSlot, slotList));
			// List<Integer> resultSlotList = hollowBigStorageCageList.stream().map(HollowBigStorageCage::getSlot).collect(Collectors.toList());
			slotRemainMap = inSlotGlassList.stream()
			.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getSlot, Collectors.summingDouble(item -> Math.max(item.getWidth(), item.getHeight()) + glassGap)));
			slotRemainMap.forEach((e, v) -> {