YiWuProject.git

			@@ -145,7 +145,8 @@
			for (Map.Entry<String, Long> entry : glassCountMap.entrySet()) {
			if (entry.getValue() > 1) {
			log.info("进片玻璃{}存在相同，结束本次任务", entry.getKey());
			//todo:向plc发送报警
			//向plc发送报警:同一车进片玻璃存在相同
			miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 2));
			return;
			}
			}
			@@ -153,14 +154,16 @@
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
			if (CollectionUtil.isNotEmpty(detailsList)) {
			log.info("理片笼存在相同的进片玻璃{}，结束本次任务", detailsList);
			//todo:向plc发送报警
			//向plc发送报警:理片笼存在相同的进片玻璃
			miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 4));
			return;
			}
			List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIdList));

			if (glassInfoList.size() != inTaskList.size()) {
			log.info("进片任务数量{}与玻璃数量{}不匹配，结束本次进片", inTaskList.size(), glassInfoList.size());
			//todo:向plc发送报警
			//向plc发送报警:进片任务数量与系统查询到的玻璃数量不匹配
			miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 8));
			return;
			}
			//按照玻璃厚度分组，判断剩余格子是否可以存放
			@@ -172,18 +175,20 @@
			.ge(HollowBigStorageCage::getMaxThickness, entry.getKey()));
			if (count < entry.getValue()) {
			log.info("笼内格子剩余数量不足，结束本次进片");
			//todo:向plc发送报警
			//向plc发送报警:笼内格子剩余数量不足
			miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 16));
			return;
			}
			}
			//todo:超大尺寸
			//超大尺寸
			if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) \|\| glassInfoList.get(0).getThickness() > slotMaxthickness) {
			int count = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
			if (count > 0) {
			log.info("直通片台存在玻璃，结束本次进片");
			//todo:向plc发送报警
			//向plc发送报警:直通片台存在玻璃，无法继续直通
			miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 64));
			return;
			}
			}
			@@ -737,7 +742,7 @@
			}


			private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list, int targetSlot, int isPair, int totalLayer, int isForce) {
			private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list, int targetSlot, int isPair, int totalLayer, int isForce) throws Exception {
			List<T> resultList = new ArrayList<>();
			List<T> tempList = new ArrayList<>();
			int taskType = Const.BIG_STORAGE_AFTER_OUT;
			@@ -762,6 +767,13 @@
			.ge(HollowBigStorageCage::getMaxThickness, list.get(0).getThickness())
			.eq(HollowBigStorageCage::getRemainWidth, slotWidth)
			.orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));

			if (null == storageCage) {
			//向plc发送报警:直通片台存在玻璃，无法继续直通
			miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
			Assert.isFalse(storageCage == null, "任务调度没有多余格子，结束调度任务");
			}

			targetSlot = storageCage.getSlot();
			hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
			.set(HollowBigStorageCage::getRemainWidth, 0).eq(HollowBigStorageCage::getSlot, targetSlot));
			@@ -798,7 +810,7 @@
			}
			Assert.isFalse(CollectionUtil.isEmpty(templist), "未获取出片数据，结束出片任务");
			log.info("获取出片任务数据{}条，执行保存", templist.size());
			List<T> baseInfoList = new ArrayList<>();
			List<T> baseInfoList = templist;
			if (1 != isForce) {
			if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
			//校验防止小于等于总层数玻璃片序不匹配的问题，该问题多出现在大片玻璃，3层
			@@ -816,21 +828,10 @@
			} else {
			//大于总层数先取totalLyaer倍数数量的玻璃，保证大车上的玻璃成对传
			int remainCount = templist.size() % totalLayer;
			if (targetSlot == 931) {
			baseInfoList = templist.subList(0, templist.size() - remainCount);
			if (targetSlot == 930) {
			baseInfoList = templist.subList(0, totalLayer);
			} else {
			//930时玻璃顺序倒序、同一对玻璃倒序
			baseInfoList = templist.subList(0, templist.size() - remainCount);
			Map<Integer, List<T>> listMap = baseInfoList.stream().collect(Collectors.groupingBy(T::getHollowSequence));
			Map<Integer, List<T>> sortListMap = new TreeMap<>(Collections.reverseOrder());
			sortListMap.putAll(listMap);
			List<T> resultList = new ArrayList<>();
			for (Map.Entry<Integer, List<T>> e : sortListMap.entrySet()) {
			for (T t : e.getValue()) {
			resultList.add(t);
			}
			}
			baseInfoList = resultList;
			}
			}
			}
			@@ -842,13 +843,13 @@
			for (T t : baseInfoList) {
			bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
			}
			while (baseInfoList.size() < 6) {
			while (bigStorageCageTaskList.size() < 6) {
			bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
			}
			//清空任务表数据
			bigStorageCageTaskService.removeAll(tableName);
			bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
			List<HollowBigStorageCageHistoryTask> historyList = baseInfoList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
			List<HollowBigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
			HollowBigStorageCageHistoryTask history = new HollowBigStorageCageHistoryTask();
			BeanUtils.copyProperties(e, history);
			history.setGlassCount(glassCount);