YiWuProject.git

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

			@Scheduled(fixedDelay = 2000)
			@Scheduled(fixedDelay = 10000)
			public void plcToHomeEdgOutTask() {
			Date startDate = new Date();
			log.info("大理片笼空车进片任务开始执行时间：{}", startDate);
			@@ -271,7 +271,7 @@
			.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
			log.info("有正在出片的钢化任务");
			computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			@@ -280,7 +280,7 @@
			List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
			if (CollectionUtils.isNotEmpty(artificialList)) {
			computeOutGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
			computeOutMoreGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			@@ -302,7 +302,7 @@
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			@@ -484,6 +484,7 @@
			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());
			@@ -492,7 +493,10 @@
			damage.setRemark("进笼前卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			slotList.add(bigStorageCageFeedTask.getTargetSlot());
			}
			//更新格子剩余宽度
			updateSlotRemainBySlots(slotList);
			log.info("进片任务执行完成");
			}
			//获取出片任务表中状态为破损的数据
			@@ -500,7 +504,7 @@
			.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));
			@@ -508,6 +512,7 @@
			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());
			@@ -516,7 +521,10 @@
			damage.setRemark("出片后卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			slotList.add(bigStorageCageOutTask.getStartSlot());
			}
			//更新格子剩余宽度
			updateSlotRemainBySlots(slotList);
			log.info("出片任务执行完成");
			}
			Date endDate = new Date();
			@@ -704,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<>();
			//打车剩余尺寸
			@@ -732,7 +802,7 @@
			trainNumber = trainNumber + 1;
			serialNumber = 1;
			maxX = e.getXCoordinate();
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
			e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1));
			}
			} else {