YiWuProject.git

			@@ -303,6 +303,8 @@
			workList.addAll(Const.G06_WORK_STATION);
			}
			}
			List<Integer> workStationAll = Arrays.asList(1, 2, 3, 4, 5, 6);
			List<Integer> offWorkStationList = workStationAll.stream().filter(e -> !workList.contains(e)).collect(Collectors.toList());
			List<DownStorageCageDetails> list = new ArrayList();
			Boolean isEmptyShelf = Boolean.FALSE;
			//对笼内玻璃进行过滤，仅出符合逻辑的玻璃
			@@ -329,8 +331,7 @@
			} else {
			log.info("存在未绑定流程卡架子，直接获取笼内所有玻璃,且未绑定架子的玻璃信息");
			//获取禁用架子的流程号，将笼内绑定架子且架子被禁用的流程卡信息
			List<Integer> workStationAll = Arrays.asList(1, 2, 3, 4, 5, 6);
			List<Integer> offWorkStationList = workStationAll.stream().filter(e -> !workList.contains(e)).collect(Collectors.toList());

			List<DownWorkstation> downWorkstationOffList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
			.and(i -> i.in(DownWorkstation::getWorkstationId, offWorkStationList).or().eq(DownWorkstation::getEnableState, Const.SLOT_OFF)));
			//获取被禁用的流程卡信息
			@@ -369,13 +370,14 @@
			}
			}
			loop:
			if (tempGlassId == null) {
			if (StringUtils.isBlank(tempGlassId)) {
			//获取正在落架的绑定流程卡的信息(流程卡、层数、落架数量)
			List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.TRUE);
			List<String> downGlassFlowList = downGlassInfoDTOList.stream().map(item -> item.getFlowCardId() + ":" + item.getLayer()).collect(Collectors.toList());
			if (CollectionUtils.isEmpty(downGlassFlowList)) {
			//架子都未绑定流程卡，出笼内子数量最多尺寸最大的玻璃id,无则返回扫描扫到的玻璃id进行出片
			tempGlassId = downStorageCageDetailsService.getGlassInfoMaxCount(glassId, workList);
			tempGlassId = downStorageCageDetailsService.getGlassInfoMaxCount(glassId, offWorkStationList);

			isBind = Boolean.TRUE;
			break loop;
			}
			@@ -388,7 +390,7 @@
			// .isNull(DownWorkstation::getFlowCardId));
			if (isEmptyShelf) {
			//架子都未绑定流程卡，出笼内子数量最多尺寸最大的玻璃id,无则返回扫描扫到的玻璃id进行出片
			tempGlassId = downStorageCageDetailsService.getGlassInfoMaxCount(glassId, workList);
			tempGlassId = downStorageCageDetailsService.getGlassInfoMaxCount(glassId, offWorkStationList);
			isBind = Boolean.TRUE;
			break loop;
			}
			@@ -436,7 +438,7 @@

			Map<String, List<DownStorageCageDetails>> singleLayerMap = list.stream().filter(item -> item.getTotalLayer() == 1)
			.collect(Collectors.groupingBy(item -> item.getFlowCardId() + item.getLayer(), Collectors.toList()));
			if (tempGlassId == null) {
			if (StringUtils.isBlank(tempGlassId)) {
			if (CollectionUtils.isNotEmpty(singleLayerMap)) {
			//获取已落架流程卡信息，按落架数量排序
			for (DownGlassInfoDTO e : downGlassInfoDTOList) {
			@@ -450,7 +452,7 @@
			}
			}
			}
			if (tempGlassId == null) {
			if (StringUtils.isBlank(tempGlassId)) {
			log.info("没有找到可以下片的的玻璃，结束任务");
			return Boolean.FALSE;
			} else {