~zhoushihao/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));
			@@ -532,7 +537,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);