YiWuProject.git

			@@ -3,11 +3,14 @@
			import cn.hutool.core.lang.Assert;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.BigStorageDTO;
			import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
			import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
			import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
			import com.mes.common.S7object;
			@@ -17,6 +20,7 @@
			import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang.StringUtils;
			@@ -24,13 +28,13 @@
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.concurrent.atomic.AtomicBoolean;
			import java.util.concurrent.atomic.AtomicReference;
			import java.util.stream.Collectors;

			@@ -257,6 +261,69 @@
			computeTargetByLine(outLine, d02GoAdress, d05GoAdress);
			}

			@Scheduled(fixedDelay = 5000)
			public void plcToHomeEdgOutTask() {
			//todo:是否有正在出片的钢化任务
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
			.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
			//任务数据获取车子存放玻璃最大数量玻璃间隔
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
			if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
			log.info("有正在出片的钢化任务");
			//打车剩余尺寸
			AtomicReference<Integer> remainWidth = new AtomicReference<>(Const.BIG_STORAGE_WIDTH);
			temperingGlassInfoList.stream().forEach(e -> {
			if (bigStorageCageOutTaskList.size() > 5 \|\| e.getWidth() > remainWidth.get()) {
			return;
			}
			remainWidth.set(remainWidth.get() - e.getWidth().intValue() - Const.BIG_STORAGE_GAP);
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
			0, 0, 1));
			});
			bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
			return;
			}

			//todo:获取状态字钢化优先 or 人工下片优先
			if (true) {
			//todo:钢化优先：获取理片笼玻璃小片破损表数量判断笼内版图是否到齐
			TemperingLayoutDTO temperingLayoutDTO = bigStorageCageDetailsService.temperingIsAll();
			if (null != temperingLayoutDTO) {
			//玻璃到齐
			//todo: 到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务结束
			List<BigStorageCageDetails> bigStorageCageDetails = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
			.eq(BigStorageCageDetails::getEngineerId, temperingLayoutDTO.getEngineerId()));
			List<TemperingGlassInfo> temperingGlassInfos = bigStorageCageDetails.stream().map(e -> {
			TemperingGlassInfo info = new TemperingGlassInfo();
			BeanUtils.copyProperties(e, info);
			return info;
			}).collect(Collectors.toList());
			temperingGlassInfoService.saveBatch(temperingGlassInfos);

			//打车剩余尺寸
			AtomicReference<Integer> remainWidth = new AtomicReference<>(Const.BIG_STORAGE_WIDTH);
			temperingGlassInfoList.stream().forEach(e -> {
			if (bigStorageCageOutTaskList.size() > 5 \|\| e.getWidth() > remainWidth.get()) {
			return;
			}
			remainWidth.set(remainWidth.get() - e.getWidth().intValue() - Const.BIG_STORAGE_GAP);
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
			0, 0, 1));
			});
			bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
			return;
			}
			//todo: 未到齐执行内部调度任务结束

			}
			//todo:笼内是否有人工下片玻璃有直接出无结束


			}


			/**
			* 按照玻璃id判断玻璃状态及卧转立是否可直接启动
			*/
			@@ -316,10 +383,10 @@
			*
			* @return
			*/
			private Integer getStartLine() {
			public Integer getStartLine() {
			List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2 group by line"));
			Assert.isTrue(CollectionUtils.isEmpty(taskList), "卧转立两条线都没有玻璃进片任务");
			Assert.isFalse(CollectionUtils.isEmpty(taskList), "卧转立两条线都没有玻璃进片任务");
			Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
			BigStorageCageFeedTask::getLine));
			GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
			@@ -333,7 +400,7 @@
			/**
			* 计算任务表进片线路的目标格子，并启动任务
			*/
			private boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) {
			public boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) {
			//1、获取任务表中的所有玻璃（指定线路且已经进卧转立完成）
			List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.eq(BigStorageCageFeedTask::getLine, line)
			@@ -347,6 +414,7 @@
			AtomicReference<BigStorageDTO> bigStorageDTO = new AtomicReference<>(new BigStorageDTO());
			Map<String, GlassInfo> glassInfoMap = glassInfos.stream().collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			AtomicBoolean taskFlag = new AtomicBoolean(Boolean.TRUE);
			taskList.stream().forEach(e -> {
			BigStorageCageDetails cageDetails = new BigStorageCageDetails();
			//按照版图信息获取进片笼子格子号
			@@ -359,21 +427,25 @@
			} else {
			bigStorageDTO.set(bigStorageCageDetailsService.queryTargetSlotByTempering(info));
			}
			e.setTragetSlot(bigStorageDTO.get().getSlot());
			e.setTargetSlot(bigStorageDTO.get().getSlot());
			cageDetails.setSlot(bigStorageDTO.get().getSlot());
			cageDetails.setState(Const.GLASS_STATE_IN);
			temperingLayoutIdTemp.set(info.getTemperingLayoutId());
			temperingFeedSequenceTemp.set(info.getTemperingFeedSequence());
			bigStorageCageDetailsList.add(cageDetails);
			taskFlag.set(bigStorageCageFeedTaskService.updateById(e));
			if (!taskFlag.get()) {
			return;
			}
			});
			//3、更新进片任务表
			boolean taskFlag = bigStorageCageFeedTaskService.updateBatchById(taskList);
			//3、更新进片任务表遇到问题：无法批量更新，批量更新无法走指定从库

			//4、在详情表中加入进片玻璃信息
			bigStorageCageDetailsService.saveBatch(bigStorageCageDetailsList);
			if (taskFlag) {
			if (taskFlag.get()) {
			String lineAddress = line.equals(Const.A09_OUT_TARGET_POSITION) ? d02GoAdress : d05GoAdress;
			S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1);
			// S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1);
			}
			return taskFlag;
			return taskFlag.get();
			}
			}