YiWuProject.git

			@@ -141,6 +141,11 @@
			return;
			}
			log.info("获取任务的玻璃id：{}", glassIdList);
			ReadWriteEntity countEntity = miloService.readFromOpcUa("DLP1A.DLP1A.glassCount");
			if (null == countEntity.getValue() \|\| Integer.parseInt(countEntity.getValue() + "") != glassIdList.size()) {
			log.info("当前大车进片玻璃数量{}与mes读取到的数量{}不匹配，结束进片任务", countEntity.getValue(), glassIdList.size());
			return;
			}
			Map<String, Long> glassCountMap = glassIdList.stream().collect(Collectors.groupingBy(e -> e, Collectors.counting()));
			for (Map.Entry<String, Long> entry : glassCountMap.entrySet()) {
			if (entry.getValue() > 1) {
			@@ -193,7 +198,7 @@
			.set(EdgGlassTaskInfo::getState, Const.EDG_GLASS_SUCCESS).in(EdgGlassTaskInfo::getGlassId, glassIdList));
			//报工
			for (String glass : glassIdList) {
			damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "磨边", "进大理片笼",1);
			damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "磨边", "进大理片笼", 1);
			}

			Map<String, List<GlassInfo>> glassListMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));
			@@ -226,6 +231,7 @@
			cageDetails.setState(Const.GLASS_STATE_NEW);
			cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
			cageDetails.setSequence(bigStorageDTO.getSlotSequence());
			cageDetails.setAngle((int) info.getAngle());
			cageDetails.setGap(glassGap);
			cageDetails.setFilmsId(info.getFilmsid());
			cageDetails.setId(null);
			@@ -250,6 +256,7 @@
			cageDetails.setDeviceId(0);
			cageDetails.setSequence(0);
			cageDetails.setGap(glassGap);
			cageDetails.setAngle((int) info.getAngle());
			cageDetails.setFilmsId(info.getFilmsid());
			cageDetails.setId(null);
			bigStorageCageDetailsService.save(cageDetails);
			@@ -532,7 +539,7 @@
			bigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_OUT);
			} else {
			bigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_IN);
			//todo:按照格子信息更新对应的设备id
			//按照格子信息更新对应的设备id
			List<Integer> slotList = storageCageDTOList.stream().map(UpdateBigStorageCageDTO::getTargetSlot).distinct().collect(Collectors.toList());
			bigStorageCageDetailsService.updateDeviceIdBySlot(slotList);

			@@ -685,9 +692,12 @@
			*/
			private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfoByVirtualSlot(List<T> list, String tableName, int targetSlot, int state, int taskType) {
			//任务数据:获取车子存放玻璃最大数量,玻璃间隔
			List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
			list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
			List<T> outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
			List<T> outGlassList = list;
			if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
			List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
			list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
			outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
			}
			Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "未获取出片数据，结束出片任务");
			log.info("获取出片任务数据{}条，执行保存", outGlassList.size());
			List<BigStorageCageTask> bigStorageCageTaskList = outGlassList.stream()