YiWuProject.git

			@@ -393,17 +393,6 @@
			log.info("当前未收到出片请求，结束出片任务");
			return;
			}
			try {
			int outRequest = s7plcWZL.readUInt16("DB51.8");
			if (outRequest == 0){
			log.info("当前未收到卧转立允许出片请求，结束出片任务");
			return;
			}
			} catch (Exception e) {
			log.error("读取卧转立信号异常", e);
			return;
			}

			//获取出片任务表
			List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
			if (CollectionUtil.isNotEmpty(outTaskList)) {
			@@ -480,6 +469,16 @@

			Integer temperingOutTargetPosition = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_TEMPERING_OUT_TARGET_POSITION);
			if (redisUtil.getCacheObject("temperingSwitch")) {
			try {
			int outRequest = s7plcWZL.readUInt16("DB51.8");
			if (outRequest == 0) {
			log.info("当前未收到卧转立允许出片请求，结束出片任务");
			return;
			}
			} catch (Exception e) {
			log.error("读取卧转立信号异常", e);
			return;
			}
			//是否允许钢化
			//是否有正在钢化的玻璃:钢化小片表关联历史任务表，筛选未出笼的玻璃信息
			// 获取当前钢化任务未完成出片的玻璃信息
			@@ -927,7 +926,7 @@
			damage.setWorkingProcedure("大理片笼");
			damage.setRemark("进笼前卧转立");
			damage.setStatus(1);
			damage.setType(item.getTaskState());
			damage.setType(Const.GLASS_STATE_DAMAGE);
			damageService.insertDamage(damage);
			slotList.add(item.getTargetSlot());
			}
			@@ -952,7 +951,7 @@
			damage.setWorkingProcedure("钢化前");
			damage.setRemark("进笼后卧转立");
			damage.setStatus(1);
			damage.setType(item.getTaskState());
			damage.setType(Const.GLASS_STATE_DAMAGE);
			damageService.insertDamage(damage);
			slotList.add(item.getTargetSlot());
			slotList.add(item.getStartSlot());
			@@ -1023,15 +1022,16 @@
			computeOutGlassInfoByVirtualSlot(List<T> list, String tableName, int targetSlot, int state, int taskType) {
			//任务数据:获取车子存放玻璃最大数量,玻璃间隔
			List<T> outGlassList = list;
			// if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
			// 临时解决方案:出片时考虑玻璃碰撞，改为一片一出
			// 界面关闭调度开关 !Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType)
			if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 7) {
			if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 8) {
			outGlassList = list.subList(0, 1);
			} else {
			List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
			list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
			outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
			if (CollectionUtil.isEmpty(glassIdList)) {
			outGlassList = list.subList(0, 1);
			} else {
			outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
			}
			}
			// }
			Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "未获取出片数据，结束出片任务");