YiWuProject.git

			@@ -96,7 +96,7 @@
			return;
			}
			log.info("2、获取到的请求字为0，将确认字改为0");
			S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 0);
			S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 0);
			return;
			}
			if (!"0".equals(confirmationWrodValue)) {
			@@ -167,7 +167,7 @@
			log.info("无空架子,获取已绑定架子的流程卡信息,查看玻璃信息是否可被对调");
			List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.FALSE);
			log.info("获取架子上已绑定流程卡落架的数量及未落架的玻璃数据：{}", downGlassInfoDTOList);
			if (CollectionUtils.isNotEmpty(downGlassInfoDTOList)) {
			if (CollectionUtils.isEmpty(downGlassInfoDTOList)) {
			log.info("已绑定流程卡均无未落架玻璃，请及时处理架子上的玻璃，清除流程卡,执行进片任务");
			} else {
			//替换玻璃信息
			@@ -236,8 +236,8 @@
			return Boolean.FALSE;
			}
			Boolean flag08 = "1".equals(out08Glassstate) ? Boolean.TRUE : Boolean.FALSE;
			if (!generateTaskByShelf(glassStatus11, flag08, glassStatus13, tempList, cageDetails)) {
			return generateTaskByShelf(glassStatus11, !flag08, glassStatus13, tempList, cageDetails);
			if (!generateTaskByShelf(glassStatus06, glassStatus11, flag08, glassStatus13, tempList, cageDetails)) {
			return generateTaskByShelf(glassStatus06, glassStatus11, !flag08, glassStatus13, tempList, cageDetails);
			}
			return Boolean.TRUE;
			}
			@@ -279,16 +279,16 @@
			}
			}

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

			if (flag08) {
			if (!"2".equals(glassStatus)) {
			if (!"2".equals(glassStatus11)) {
			workList.addAll(Const.G11_WORK_STATION);
			}
			} else {
			if (!"2".equals(glassStatus)) {
			if (!"2".equals(glassStatus06)) {
			workList.addAll(Const.G06_WORK_STATION);
			}
			}
			@@ -297,7 +297,7 @@
			//对笼内玻璃进行过滤，仅出符合逻辑的玻璃
			if (CollectionUtils.isNotEmpty(workList)) {
			List<DownWorkstation> downWorkstationList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
			.eq(DownWorkstation::getEnableState, 0).in(DownWorkstation::getWorkstationId, workList));
			.eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, workList));
			log.info("架子被禁用，无法出片落架");
			if (CollectionUtils.isEmpty(downWorkstationList)) {
			log.info("笼子被禁用，无法走机械臂下片");
			@@ -474,6 +474,8 @@
			log.info("更新详情表内的状态失败");
			return Boolean.FALSE;
			}
			//更新落架玻璃数量

			//生成任务信息
			DownGlassInfo downGlassInfo = new DownGlassInfo();
			BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
			@@ -490,7 +492,7 @@
			downGlassTask.setStartCell(startCell);
			downGlassTask.setGlassId(glassInfo.getGlassId());
			downGlassTask.setEndCell(endCell);
			downGlassTask.setTaskType(taskType + "");
			downGlassTask.setTaskType(taskType);
			downGlassTask.setWidth((int) glassInfo.getWidth());
			downGlassTask.setHeight((int) glassInfo.getHeight());
			downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
			@@ -506,13 +508,13 @@
			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(), (short) width);
			s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), (short) height);
			s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), (short) thickness);
			s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), (short) startCell);
			s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), (short) endCell);
			s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), (short) taskType);
			s7control.writeWord(plcMesObject.getPlcParameter("confirmationWord").getAddress(), (short) 1);
			s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), width);
			s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), height);
			s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), thickness);
			s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), startCell);
			s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), endCell);
			s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), taskType);
			s7control.writeWord(plcMesObject.getPlcParameter("confirmationWord").getAddress(), 1);
			return Boolean.TRUE;
			}
			}