YiWuProject.git

			@@ -30,10 +30,7 @@
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -164,10 +161,7 @@
			if (CollectionUtils.isNotEmpty(list)) {
			log.info("有空架子,将流程卡与架子好绑定，执行进片任务结束");
			//绑定流程卡
			downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>()
			.set(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId())
			.set(DownWorkstation::getLayer, glassInfo.getLayer())
			.eq(DownWorkstation::getWorkstationId, list.get(0).getWorkstationId()));
			downWorkstationService.updateFlowCardIdAndCount(glassInfo.getFlowCardId(), glassInfo.getLayer(), list.get(0).getWorkstationId());
			checkFlag = Boolean.TRUE;
			}
			}
			@@ -182,27 +176,28 @@
			endLoop:
			for (DownGlassInfoDTO e : downGlassInfoDTOList) {
			List<GlassInfo> glassInfoList = e.getGlassInfoList();
			for (GlassInfo item : glassInfoList) {
			if (item.getWidth() == glassInfo.getWidth() && item.getHeight() == glassInfo.getHeight()
			&& item.getThickness() == glassInfo.getThickness() && item.getFilmsid().equals(glassInfo.getFilmsid())) {
			//玻璃是否为多层
			checkFlag = multilayerCheck(item, Boolean.FALSE);
			if (checkFlag) {
			//玻璃替换仅替换流程卡id及层数
			String tempFlowCardId = item.getFlowCardId();
			Integer tempLayer = item.getLayer();
			String flowCardId = glassInfo.getFlowCardId();
			Integer layer = glassInfo.getLayer();
			log.info("替换流程卡信息,当前玻璃信息:{}的流程卡号{}及层数{},替换后玻璃信息:{}的流程卡号{}及层数{}",
			item, glassInfo, flowCardId, layer, tempFlowCardId, tempLayer);
			glassInfo.setFlowCardId(tempFlowCardId);
			glassInfo.setLayer(tempLayer);
			glassInfoService.updateById(glassInfo);
			item.setFlowCardId(flowCardId);
			item.setLayer(layer);
			glassInfoService.updateById(item);
			break endLoop;
			}
			Optional<GlassInfo> glassInfoTempOptional = glassInfoList.stream().filter(item -> item.getWidth() == glassInfo.getWidth() && item.getHeight() == glassInfo.getHeight()
			&& item.getThickness() == glassInfo.getThickness() && item.getFilmsid().equals(glassInfo.getFilmsid()))
			.findFirst();
			if (glassInfoTempOptional.isPresent()) {
			GlassInfo item = glassInfoTempOptional.get();
			//玻璃是否为多层
			checkFlag = multilayerCheck(item, Boolean.FALSE);
			if (checkFlag) {
			//玻璃替换仅替换流程卡id及层数
			String tempFlowCardId = item.getFlowCardId();
			Integer tempLayer = item.getLayer();
			String flowCardId = glassInfo.getFlowCardId();
			Integer layer = glassInfo.getLayer();
			log.info("替换流程卡信息,当前玻璃信息:{}的流程卡号{}及层数{},替换后玻璃信息:{}的流程卡号{}及层数{}",
			item, glassInfo, flowCardId, layer, tempFlowCardId, tempLayer);
			glassInfo.setFlowCardId(tempFlowCardId);
			glassInfo.setLayer(tempLayer);
			glassInfoService.updateById(glassInfo);
			item.setFlowCardId(flowCardId);
			item.setLayer(layer);
			glassInfoService.updateById(item);
			break endLoop;
			}
			}
			}
			@@ -215,11 +210,13 @@
			downStorageCageDetails.setState(Const.GLASS_STATE_IN);
			downStorageCageDetails.setSlot(nearestEmpty.getSlot());
			downStorageCageDetailsService.save(downStorageCageDetails);
			// 生成进片任务

			// 生成进片任务
			initDownGlassTask(glassInfo, 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
			}

			public Boolean outTo(String glassStatus06, String out08Glassstate, String glassStatus11, String glassStatus13, String glassId, String currentSlot) {
			public Boolean outTo(String glassStatus06, String out08Glassstate, String glassStatus11, String
			glassStatus13, String glassId, String currentSlot) {
			if ("2".equals(glassStatus06) && "2".equals(glassStatus11) && "2".equals(glassStatus13)) {
			log.info("G06、G11、G13分别为{},{}、{}非自动状态，无法出片", glassStatus06, glassStatus11, glassStatus13);
			return Boolean.FALSE;
			@@ -287,7 +284,8 @@
			}
			}

			private Boolean generateTaskByShelf(String glassStatus06, String glassStatus11, Boolean flag08, String glassStatus13, List<DownStorageCageDetails> tempList, DownStorageCageDetails cageDetails, String glassId) {
			private Boolean generateTaskByShelf(String glassStatus06, String glassStatus11, Boolean flag08, String
			glassStatus13, List<DownStorageCageDetails> tempList, DownStorageCageDetails cageDetails, String glassId) {
			//获取2个机械臂范围内的架子绑定的流程卡信息
			List<Integer> workList = new ArrayList();

			@@ -440,7 +438,8 @@
			}
			}

			public Boolean generateDownGlassOutTask(String glassId, Integer taskType, Boolean isBind, DownStorageCageDetails cageDetails) {
			public Boolean generateDownGlassOutTask(String glassId, Integer taskType, Boolean
			isBind, DownStorageCageDetails cageDetails) {
			//按玻璃id获取玻璃信息
			DownStorageCageDetails downStorageCageDetails = null;
			if (glassId.equals(cageDetails.getGlassId())) {
			@@ -448,19 +447,17 @@
			taskType = 3;
			} else {
			downStorageCageDetails = downStorageCageDetailsService.getOne(new LambdaQueryWrapper<DownStorageCageDetails>()
			.eq(DownStorageCageDetails::getGlassId, glassId));
			.eq(DownStorageCageDetails::getGlassId, glassId).eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN));
			}

			Integer endCell = null;
			if (isBind) {
			if (!isBind) {
			//获取空架子信息，将空架子信息绑定流程卡
			DownWorkstation emptyDownWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>()
			.isNull(DownWorkstation::getFlowCardId).orderByDesc(DownWorkstation::getWorkstationId).last("limit 1"));
			if (null != emptyDownWorkstation) {
			log.info("获取到空架子信息，绑定流程卡");
			emptyDownWorkstation.setFlowCardId(downStorageCageDetails.getFlowCardId());
			emptyDownWorkstation.setLayer(downStorageCageDetails.getLayer());
			downWorkstationService.updateById(emptyDownWorkstation);
			downWorkstationService.updateFlowCardIdAndCount(downStorageCageDetails.getFlowCardId(), downStorageCageDetails.getLayer(), emptyDownWorkstation.getWorkstationId());
			endCell = emptyDownWorkstation.getWorkstationId();
			} else {
			log.info("没有空架子信息，无法绑定流程卡");
			@@ -480,8 +477,14 @@
			return Boolean.FALSE;
			}
			//更新落架玻璃数量
			downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId())
			.eq("layer", downStorageCageDetails.getLayer()).setSql("racks_number = racks_number +1"));
			if (endCell == 7) {
			downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId())
			.eq("layer", downStorageCageDetails.getLayer()).setSql("other_number = other_number +1"));
			} else {
			downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId())
			.eq("layer", downStorageCageDetails.getLayer()).setSql("racks_number = racks_number +1"));
			}

			//生成任务信息
			DownGlassInfo downGlassInfo = new DownGlassInfo();
			BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
			@@ -503,7 +506,7 @@
			downGlassTask.setHeight((int) glassInfo.getHeight());
			downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
			downGlassTask.setLayer(glassInfo.getLayer());
			downGlassTask.setTaskStauts(0);
			downGlassTask.setTaskStatus(0);
			downGlassTask.setCreateTime(new Date());
			downGlassTaskService.save(downGlassTask);
			//向plc发送命令
			@@ -511,7 +514,8 @@
			startCell, endCell, taskType);
			}

			private Boolean sendMessageToPlc(int width, int height, int thickness, int startCell, int endCell, int taskType) {
			private Boolean sendMessageToPlc(int width, int height, int thickness, int startCell, int endCell,
			int taskType) {
			S7control s7control = S7object.getinstance().plccontrol;
			PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
			s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), width);