YiWuProject.git

			@@ -92,6 +92,8 @@
			String d02State = plcParameterObject.getPlcParameter("D02ID").getValue();
			String d03State = plcParameterObject.getPlcParameter("D03State").getValue();
			String d05State = plcParameterObject.getPlcParameter("D05State").getValue();
			String mesD01Value = plcParameterObject.getPlcParameter("MESToD01").getValue();
			String mesD04Value = plcParameterObject.getPlcParameter("MESToD04").getValue();
			String mesD01Address = plcParameterObject.getPlcParameter("MESToD01").getAddress();
			String mesD04Address = plcParameterObject.getPlcParameter("MESToD04").getAddress();
			String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
			@@ -106,11 +108,12 @@
			log.info("两条线卧转立均在执行任务，结束本次扫描进卧转立任务");
			return;
			}
			//按照线路及玻璃id获取相邻两块玻璃卧转立上的玻璃
			if (REQUEST_WORD.equals(d01ToMES) && (StringUtils.isBlank(d02State) \|\| !REQUEST_WORD.equals(d03State))) {
			//按照线路及玻璃id获取相邻两块玻璃卧转立上的玻璃: 状态为0不操作（D01送片，0不操作，1允许送片），请求字为1，（02玻璃id为空或者卧转立未启动）
			if (!REQUEST_WORD.equals(mesD01Value) && REQUEST_WORD.equals(d01ToMES) && (StringUtils.isBlank(d02State) \|\| !REQUEST_WORD.equals(d03State))) {
			judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD01Address);
			}
			if (REQUEST_WORD.equals(d04ToMES) && !REQUEST_WORD.equals(d05State)) {
			// 状态为0不操作（D01送片，0不操作，1允许送片），请求字为1，卧转立未启动
			if (!REQUEST_WORD.equals(mesD04Value) && REQUEST_WORD.equals(d04ToMES) && !REQUEST_WORD.equals(d05State)) {
			judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD04Address);
			}
			Date endDate = new Date();
			@@ -299,6 +302,33 @@
			}
			}

			/**
			* 处理破损表任务
			*/
			@Scheduled(fixedDelay = 300)
			public void dealDamageTask() {
			Date startDate = new Date();
			log.info("大理片笼破损玻璃清除任务开始执行时间：{}", startDate);
			//获取进片任务表中状态为破损的数据
			List<BigStorageCageFeedTask> inDamageTaskInfoList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.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:将破损信息新增入破损表
			}
			//获取出片任务表中状态为破损的数据
			List<BigStorageCageOutTask> outDamageTaskInfoList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
			.eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE));
			if (CollectionUtils.isNotEmpty(outDamageTaskInfoList)) {
			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:将破损信息新增入破损表
			}
			Date endDate = new Date();
			log.info("大理片笼破损玻璃清除任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			}

			/**
			* 按照玻璃id判断玻璃状态及卧转立是否可直接启动