YiWuProject.git

			@@ -244,7 +244,7 @@
			log.info("大理片笼空车进片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			}

			@Scheduled(fixedDelay = 5000)
			@Scheduled(fixedDelay = 300)
			public void plcToHomeEdgOutTask() {
			Date startDate = new Date();
			log.info("大理片笼空车进片任务开始执行时间：{}", startDate);
			@@ -313,6 +313,7 @@
			//执行内部调度任务
			List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
			if (CollectionUtils.isNotEmpty(temperingOccupySlotList)) {
			loop:
			for (TemperingLayoutDTO temperingOccupySlot : temperingOccupySlotList) {
			List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());
			for (int i = 0; i < slotSequenceList.size() - 1; i++) {
			@@ -336,8 +337,11 @@
			//更新理片笼详情表调度的后的玻璃位置信息：生成任务后先将玻璃格子位置进行调整，玻璃状态改为调度中，新增调度完成任务，处理调度完成后玻璃状态改为100.
			List<String> glassList = list.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
			bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>().set(BigStorageCageDetails::getState, Const.GLASS_STATE_SCHEDULE_ING)
			.set(BigStorageCageBaseInfo::getSlot, second.getSlot()).eq(BigStorageCageDetails::getGlassId, glassList));
			break;
			.set(BigStorageCageBaseInfo::getSlot, second.getSlot()).in(BigStorageCageDetails::getGlassId, glassList));
			//两次更新笼子的剩余尺寸：第一次防止有玻璃继续进调度后的笼子，第二次更新：计算格子的实际尺寸
			// 仅更新调度后的格子信息：起始格子完成后更新：防止调度出片过程中有新玻璃进入，
			updateSlotRemainBySlots(Arrays.asList(second.getSlot()));
			break loop;
			}
			}
			}
			@@ -477,9 +481,10 @@
			log.info("获取进片任务表中破损的玻璃信息{}", inDamageTaskInfoList);
			bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			//理片笼详情表数据状态更新
			bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
			.set(BigStorageCageDetails::getState, Const.GLASS_STATE_DAMAGE).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));
			bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));
			//将破损信息新增入破损表
			List<Integer> slotList = new ArrayList<>();
			for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {
			Damage damage = new Damage();
			damage.setGlassId(bigStorageCageFeedTask.getGlassId());
			@@ -488,7 +493,10 @@
			damage.setRemark("进笼前卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			slotList.add(bigStorageCageFeedTask.getTargetSlot());
			}
			//更新格子剩余宽度
			updateSlotRemainBySlots(slotList);
			log.info("进片任务执行完成");
			}
			//获取出片任务表中状态为破损的数据
			@@ -496,15 +504,15 @@
			.eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE));
			if (CollectionUtils.isNotEmpty(outDamageTaskInfoList)) {
			log.info("获取出片任务表中破损的玻璃信息{}", outDamageTaskInfoList);
			bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE));
			List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
			//移除钢化下片表数据
			temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList));
			//理片笼详情表数据状态更新
			bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
			.set(BigStorageCageDetails::getState, Const.GLASS_STATE_DAMAGE).in(BigStorageCageDetails::getGlassId, glassIdList));
			//理片笼详情表数据状态删除
			bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, glassIdList));

			//将破损信息新增入破损表
			List<Integer> slotList = new ArrayList<>();
			for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) {
			Damage damage = new Damage();
			damage.setGlassId(bigStorageCageOutTask.getGlassId());
			@@ -513,7 +521,10 @@
			damage.setRemark("出片后卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			slotList.add(bigStorageCageOutTask.getStartSlot());
			}
			//更新格子剩余宽度
			updateSlotRemainBySlots(slotList);
			log.info("出片任务执行完成");
			}
			Date endDate = new Date();
			@@ -661,9 +672,9 @@
			BeanUtils.copyProperties(info, cageDetails);
			//2、获取目标格子信息
			BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);
			//3、更新大理片笼表剩余宽度（更新大理片笼剩余尺寸移到进笼完成后执行）
			// bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - info.getWidth() - glassGap)
			// .eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
			//3、临时更新格子的剩余尺寸：防止相邻玻璃进同一格子造成剩余尺寸不足，玻璃越界的情况，任务完成后再次更新大理片笼表剩余宽度（按照笼内玻璃数量更新大理片笼剩余尺寸）
			bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap)
			.eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
			//4、更新进片任务表，目标格子及状态（状态改为2 电气扫到自行处理）遇到问题：无法批量更新，批量更新无法走指定从库
			e.setTargetSlot(bigStorageDTO.getSlot());
			bigStorageCageFeedTaskService.updateById(e);
			@@ -674,6 +685,7 @@
			cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
			cageDetails.setGap(glassGap);
			bigStorageCageDetailsService.save(cageDetails);

			}
			sendTaskListToPLC(taskList, line);
			return Boolean.TRUE;
			@@ -700,7 +712,69 @@
			}
			}

			/**
			* 出片一次仅生成一车玻璃
			*
			* @param list
			* @param isTempering
			* @param mesToPLCAddress
			* @param <T>
			* @return
			*/
			private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
			//任务数据获取车子存放玻璃最大数量玻璃间隔
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
			//打车剩余尺寸
			Integer remainWidth = carWidth;
			int maxX = 0;
			for (T e : list) {
			if (bigStorageCageOutTaskList.size() >= outCarMaxSize \|\| Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
			break;
			}
			remainWidth = remainWidth - Math.max((int) e.getWidth(), (int) e.getHeight()) - glassGap;
			if (isTempering) {
			int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
			if (maxX + minLength <= xMaxSize) {
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
			e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1));
			maxX = Math.max(maxX, e.getXCoordinate());
			} else {
			break;
			}

			} else {
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
			e.getWidth() * 10, e.getHeight(), 0, 0, 1));
			}
			}
			Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");
			log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());
			bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
			List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
			log.info("将出片玻璃{}玻璃状态改为已出片", glassIds);
			bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
			.set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
			.in(BigStorageCageDetails::getGlassId, glassIds));
			int returnData = 0;
			int count = 1;
			while (returnData == 0) {
			S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
			returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
			log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, mesToPLCAddress, returnData);
			}
			return Boolean.TRUE;
			}

			/**
			* 出片一次生成一炉玻璃
			*
			* @param list
			* @param isTempering
			* @param mesToPLCAddress
			* @param <T>
			* @return
			*/
			private <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
			//任务数据获取车子存放玻璃最大数量玻璃间隔
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
			//打车剩余尺寸
			@@ -710,12 +784,11 @@
			int maxX = 0;
			for (T e : list) {
			int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
			if (bigStorageCageOutTaskList.size() >= outCarMaxSize \|\| maxLength > remainWidth) {
			if (serialNumber > outCarMaxSize \|\| maxLength > remainWidth) {
			remainWidth = carWidth;
			trainNumber = trainNumber + 1;
			serialNumber = 1;
			maxX = 0;
			continue;
			}
			remainWidth = remainWidth - maxLength - glassGap;
			if (isTempering) {
			@@ -725,11 +798,12 @@
			e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1));
			maxX = Math.max(maxX, e.getXCoordinate());
			} else {
			remainWidth = carWidth;
			remainWidth = carWidth - maxLength - glassGap;
			trainNumber = trainNumber + 1;
			serialNumber = 1;
			maxX = 0;
			continue;
			maxX = e.getXCoordinate();
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
			e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1));
			}
			} else {
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
			@@ -763,9 +837,10 @@
			if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
			//存在将格子内的玻璃分别进行更新
			slotRemainMap = inSlotGlassList.stream()
			.collect(Collectors.groupingBy(BigStorageCageDetails::getSlot, Collectors.summingDouble(item -> item.getWidth() + glassGap)));
			.collect(Collectors.groupingBy(BigStorageCageDetails::getSlot, Collectors.summingDouble(item -> Math.max(item.getWidth(), item.getHeight()) + glassGap)));
			slotRemainMap.forEach((e, v) -> {
			bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth - v)
			double remainWidth = slotWidth - v >= 0 ? slotWidth - v : 0;
			bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, remainWidth)
			.eq(BigStorageCage::getSlot, e));
			});
			}