~admin/HangZhouMes.git

			@@ -20,6 +20,8 @@
			import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
			import com.mes.common.S7object;
			import com.mes.common.config.Const;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.device.PlcParameterObject;
			import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
			import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
			@@ -60,6 +62,8 @@
			private EdgGlassTaskInfoService edgGlassTaskInfoService;
			@Resource
			private TemperingGlassInfoService temperingGlassInfoService;
			@Resource
			private DamageService damageService;

			private static final String REQUEST_WORD = "1";

			@@ -314,7 +318,16 @@
			.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			if (CollectionUtils.isNotEmpty(inDamageTaskInfoList)) {
			bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			//todo:将破损信息新增入破损表
			//将破损信息新增入破损表
			for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {
			Damage damage = new Damage();
			damage.setGlassId(bigStorageCageFeedTask.getGlassId());
			damage.setLine(bigStorageCageFeedTask.getLine());
			damage.setWorkingProcedure("冷加工");
			damage.setRemark("进笼前卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			}
			}
			//获取出片任务表中状态为破损的数据
			List<BigStorageCageOutTask> outDamageTaskInfoList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
			@@ -323,7 +336,16 @@
			bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
			temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList));
			//todo:将破损信息新增入破损表
			//将破损信息新增入破损表
			for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) {
			Damage damage = new Damage();
			damage.setGlassId(bigStorageCageOutTask.getGlassId());
			damage.setLine(bigStorageCageOutTask.getEndSlot());
			damage.setWorkingProcedure("冷加工");
			damage.setRemark("出片后卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			}
			}
			Date endDate = new Date();
			log.info("大理片笼破损玻璃清除任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			@@ -355,27 +377,29 @@
			Boolean flag = Boolean.TRUE;
			//2、获取卧转立
			Integer widthFirst = Math.max(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
			Integer heightFirst = Math.min(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
			if (edgGlassTaskInfoList.size() == 1) {
			if (remainWidth >= widthFirst) {
			if (glassCount < inCarMaxSize) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
			}
			} else {
			flag = Boolean.FALSE;
			}
			} else {
			Integer widthSecond = Math.max(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
			Integer heightSecond = Math.min(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
			if (remainWidth >= widthFirst) {
			if (remainWidth - widthFirst - glassGap >= widthSecond) {
			if (glassCount < inCarMaxSize) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightSecond);
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
			}
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
			}
			} else {
			flag = Boolean.FALSE;
			@@ -392,13 +416,14 @@
			/**
			* 添加任务信息
			*/
			private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width) {
			private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width, Integer height) {
			BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
			bigStorageCageFeedTask.setGlassId(glassId);
			bigStorageCageFeedTask.setTaskState(Const.BIG_STORAGE_IN_NEW);
			bigStorageCageFeedTask.setLine(line);
			bigStorageCageFeedTask.setTaskType(taskType);
			bigStorageCageFeedTask.setWidth(width);
			bigStorageCageFeedTask.setHeight(height);
			bigStorageCageFeedTask.setCreateTime(new Date());
			return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
			}
			@@ -554,6 +579,9 @@
			public Boolean computeIsRun(int line, String glassId) {
			//获取卧转立剩余宽度
			BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
			if (sitToUpRemainWidth.getGlassCount() == 0) {
			return Boolean.FALSE;
			}
			//获取玻璃信息
			GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
			return sitToUpRemainWidth.getWidth() < glassInfo.getWidth();