YiWuProject.git

			@@ -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("笼子被禁用，无法走机械臂下片");
			@@ -492,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());