~zhoushihao/YiWuProject.git

			@@ -11,7 +11,7 @@
			import com.mes.base.entity.BigStorageCageBaseInfo;
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.BigStorageDTO;
			import com.mes.bigstorage.entity.dto.BigStorageDTO;
			import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
			import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			@@ -35,7 +35,6 @@
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			@@ -84,8 +83,13 @@
			@Value("${mes.sequence.order}")
			private boolean sequenceOrder;

			@Value("${mes.temperingOutTargetPosition}")
			private Integer temperingOutTargetPosition;
			@Value("${mes.artificialOutTargetPosition}")
			private Integer artificialOutTargetPosition;

			@Scheduled(fixedDelay = 1000)

			// @Scheduled(fixedDelay = 1000)
			public void inBigStorageTask() throws Exception {
			ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
			if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
			@@ -107,9 +111,26 @@
			if (CollectionUtils.isEmpty(inTaskList)) {
			log.info("当前大车无进片玻璃，结束进片任务");
			}

			List<String> glassIdList = inTaskList.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
			log.info("获取任务的玻璃id：{}", glassIdList);
			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) {
			log.info("进片玻璃{}存在相同，结束本次任务", entry.getKey());
			//todo:向plc发送报警
			return;
			}
			}
			List<BigStorageCageDetails> detailsList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, glassIdList)
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
			if (CollectionUtil.isNotEmpty(detailsList)) {
			log.info("理片笼存在相同的进片玻璃{}，结束本次任务", detailsList);
			//todo:向plc发送报警
			return;
			}
			List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIdList));

			Map<String, List<GlassInfo>> glassListMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));

			//计算目标格子
			@@ -147,7 +168,7 @@
			miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 1));
			}

			@Scheduled(fixedDelay = 1000)
			// @Scheduled(fixedDelay = 1000)
			public void outBigStorageTask() throws Exception {
			Date startDate = new Date();
			ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
			@@ -215,7 +236,7 @@
			List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
			.orderByAsc(BigStorageCageDetails::getSlot)
			.orderByDesc(BigStorageCageDetails::getId));
			.orderByAsc(BigStorageCageDetails::getId));
			if (CollectionUtils.isNotEmpty(artificialList)) {
			computeOutGlassInfo(artificialList, "big_storage_cage_out_one_task", Const.ARTIFICIAL_OUT_TARGET_POSITION, Const.GLASS_STATE_OUT_ING, Const.BIG_STORAGE_BEFORE_OUT);
			Date endDate = new Date();
			@@ -242,7 +263,10 @@
			if (CollectionUtils.isNotEmpty(list)) {
			computeOutGlassInfo(list, "big_storage_cage_out_one_task", second.getSlot(), Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			}
			updateSlotRemainBySlots(Arrays.asList(second.getSlot()));
			//使用Arrays.asList() 使用removeAll报错，改为正常使用List
			List<Integer> slotList = new ArrayList<>();
			slotList.add(second.getSlot());
			updateSlotRemainBySlots(slotList);
			break loop;
			}
			}
			@@ -253,7 +277,7 @@
			return;
			}

			@Scheduled(fixedDelay = 1000)
			// @Scheduled(fixedDelay = 1000)
			public void finishInBigStorageTask() throws Exception {
			ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
			if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
			@@ -311,13 +335,13 @@
			miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 0));
			}

			@Scheduled(fixedDelay = 1000)
			// @Scheduled(fixedDelay = 1000)
			public void finishOutBigStorageTask() throws Exception {
			// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
			// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
			// log.info("当前为非联机状态，结束完成出片任务");
			// return;
			// }
			ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
			if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
			log.info("当前为非联机状态，结束完成出片任务");
			return;
			}
			//获取进片任务表
			List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
			if (CollectionUtils.isEmpty(outTaskList)) {
			@@ -359,7 +383,7 @@
			}
			return storageCageDTO;
			}).collect(Collectors.toList());
			bigStorageCageDetailsService.updateBySlot(storageCageDTOList, finalTaskType);
			bigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_OUT);
			log.info("4、大理片笼进片状态已完成已完成的玻璃信息id:{}", v);
			updateSlotRemainBySlots(outSuccessGlassSlot);
			} else if (e1 == 3) {
			@@ -376,9 +400,23 @@
			.set(BigStorageCageHistoryTask::getTaskState, item.getTaskState())
			.eq(BigStorageCageHistoryTask::getTaskType, taskType)
			.eq(BigStorageCageHistoryTask::getGlassId, item.getGlassId()));
			//更新钢化小片表
			Integer taskState = item.getTaskState();
			if (taskState == 2) {
			temperingGlassInfoService.update(new LambdaUpdateWrapper<TemperingGlassInfo>()
			.set(TemperingGlassInfo::getState, Const.TEMPERING_OUT).eq(TemperingGlassInfo::getGlassId, item.getGlassId()));
			} else if (taskState == 3) {
			// temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().eq(TemperingGlassInfo::getGlassId, item.getGlassId()));
			temperingGlassInfoService.update(new LambdaUpdateWrapper<TemperingGlassInfo>()
			.set(TemperingGlassInfo::getState, Const.TEMPERING_DAMAGE
			).eq(TemperingGlassInfo::getGlassId, item.getGlassId()));

			} else {
			// 空执行
			}
			}
			//清空任务表数据
			bigStorageCageTaskService.removeAll("big_storage_cage_out_one_task");
			// 重置任务表数据
			bigStorageCageTaskService.updateOutTaskMessage("big_storage_cage_out_one_task");
			//清空启动状态
			//向opc发送启动信号
			miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 0));
			@@ -512,6 +550,8 @@
			while (bigStorageCageTaskList.size() < 6) {
			bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
			}
			//清空任务表数据
			bigStorageCageTaskService.removeAll("big_storage_cage_out_one_task");
			bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
			List<BigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
			BigStorageCageHistoryTask history = new BigStorageCageHistoryTask();
			@@ -527,6 +567,11 @@
			.set(BigStorageCageDetails::getState, state)
			.set(Const.GLASS_STATE_SCHEDULE_ING.equals(state), BigStorageCageBaseInfo::getSlot, targetSlot)
			.in(BigStorageCageDetails::getGlassId, glassIds));
			try {
			miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
			} catch (Exception e) {
			e.printStackTrace();
			}
			return Boolean.TRUE;
			}