YiWuProject.git

			@@ -3,7 +3,6 @@
			import cn.hutool.core.lang.Assert;
			import cn.smallbun.screw.core.util.CollectionUtils;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.mes.common.S7object;
			@@ -165,31 +164,6 @@
			log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			/**
			* 更新已绑定工位流程卡的破损/拿走的数量信息
			*/
			@Scheduled(fixedDelay = 1000)
			public void updateWorkStationOtherCount() {
			Date startDate = new Date();
			log.info("下片破更新损玻璃数量任务开始执行时间：{}", startDate);
			//获取已绑定流程卡的工位信息
			List<DownWorkstation> downWorkstationList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
			.isNotNull(DownWorkstation::getFlowCardId)
			.ne(DownWorkstation::getFlowCardId, "")
			.orderByDesc(DownWorkstation::getWorkstationId));
			for (DownWorkstation downWorkstation : downWorkstationList) {
			//更新工位其他玻璃信息的数量
			QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("process_id", downWorkstation.getFlowCardId());
			queryWrapper.eq("technology_number", downWorkstation.getLayer());
			int otherNumber = damageService.count(queryWrapper);
			downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getOtherNumber, otherNumber)
			.eq(DownWorkstation::getWorkstationId, downWorkstation.getWorkstationId()));
			}
			Date endDate = new Date();
			log.info("下片破更新损玻璃数量任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			public void inTo(String glassId, String requestWord, String currentSlot) {
			log.info("1、按照玻璃id:{}获取玻璃小片信息,当前格子为:{}", glassId, currentSlot);
			//添加进片任务查找空格
			@@ -279,7 +253,6 @@
			BeanUtils.copyProperties(glassInfo, downStorageCageDetails);
			downStorageCageDetails.setState(Const.GLASS_STATE_IN);
			downStorageCageDetails.setSlot(nearestEmpty.getSlot());
			downStorageCageDetails.setDeviceId(nearestEmpty.getDeviceId());
			downStorageCageDetailsService.save(downStorageCageDetails);
			// 生成进片任务
			initDownGlassTask(glassInfo, 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
			@@ -302,7 +275,6 @@
			//获取当前笼子空格信息
			DownStorageCage empty = downStorageCageService.selectCacheEmpty(Integer.parseInt(currentSlot), Boolean.TRUE);
			cageDetails.setSlot(empty.getSlot());
			cageDetails.setDeviceId(empty.getDeviceId());
			tempList.add(cageDetails);
			}
			log.info("出片2：笼内玻璃的数据(包括待进片)有：{}", tempList);
			@@ -406,15 +378,8 @@
			.filter(item -> StringUtils.isNotBlank(item.getFlowCardId())).collect(Collectors.groupingBy(item -> item.getFlowCardId() + ":" + item.getLayer()));
			//过滤筛选获取架子上对应流程卡+层数的笼子内的玻璃信息
			list = tempList.stream().filter(item -> listMap.containsKey(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
			if (CollectionUtils.isEmpty(list) && flag08 && !"2".equals(glassStatus13)) {
			list = tempList.stream().filter(item -> {
			double firstLength = Math.max(item.getWidth(), item.getHeight());
			double secondLength = Math.min(item.getWidth(), item.getHeight());
			return firstLength > maxWidth \|\| secondLength > maxHeight;
			}).collect(Collectors.toList());
			}
			} else {
			log.info("存在未绑定流程卡架子，直接获取笼内所有玻璃,且未绑定架子的玻璃信息（都可以出的玻璃）");
			log.info("存在未绑定流程卡架子，直接获取笼内所有玻璃,且未绑定架子的玻璃信息");
			//获取禁用及非本机械臂的架子的流程号及层数对应的玻璃信息
			List<DownWorkstation> downWorkstationOffList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
			.and(i -> i.in(DownWorkstation::getWorkstationId, offWorkStationList).or().eq(DownWorkstation::getEnableState, Const.SLOT_OFF)));
			@@ -444,8 +409,6 @@
			log.info("笼内玻璃无法执行出片");
			return Boolean.FALSE;
			}
			//获取具体出那一片玻璃
			//tao:人工--> 所有架子都未绑定时进行绑定 --->有未绑定架子时进行绑定 --->绑定过流程卡的玻璃-->玻璃流程卡多层--->玻璃流程卡单层
			String tempGlassId = null;
			Boolean isNeedBind = Boolean.FALSE;

			@@ -463,7 +426,7 @@
			loop:
			if (StringUtils.isBlank(tempGlassId)) {
			//获取正在落架的绑定流程卡的信息(流程卡、层数、落架数量)
			//落架玻璃数为0，即使绑定了流程卡，也无法找到对应的架子信息，只能重新绑定
			//todo:落架玻璃数为0，即使绑定了流程卡，也无法找到对应的架子信息，只能重新绑定
			List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationFlowCard(workList);
			List<String> downGlassFlowList = downGlassInfoDTOList.stream().map(item -> item.getFlowCardId() + ":" + item.getLayer()).collect(Collectors.toList());
			if (CollectionUtils.isEmpty(downGlassFlowList)) {
			@@ -473,7 +436,6 @@
			break loop;
			}
			//将笼子内的玻璃进行过滤，仅获取无法落架的流程卡玻璃
			//tao:当有空架时优先对笼内可出片且未绑架子的玻璃进出绑架并出片
			List<DownStorageCageDetails> noDownLoadList = list.stream().filter(item -> !downGlassFlowList.contains(item.getFlowCardId() + ":" + item.getLayer()))
			.collect(Collectors.toList());
			if (CollectionUtils.isNotEmpty(noDownLoadList)) {
			@@ -494,7 +456,7 @@
			return Boolean.FALSE;
			}
			//将笼内玻璃的流程卡+层号和落架的流程卡去重，得出展示无法落架的玻璃，判断玻璃数是否超过阈值
			//笼内玻璃是否可落架:笼内是否有需要中空
			//笼内玻璃是否可落架:笼内是否有需要中空的
			List<DownStorageCageDetails> multiLayerList = list.stream().filter(item -> item.getTotalLayer() >= 2).collect(Collectors.toList());
			if (CollectionUtils.isNotEmpty(multiLayerList)) {
			for (DownStorageCageDetails item : multiLayerList) {
			@@ -511,7 +473,7 @@
			break loop;
			}
			Integer sequence = downGlassInfoService.queryMaxSequence(item.getFlowCardId(), item.getLayer());
			log.info("获取当前玻璃需要放的次序：笼内同流程同层数的落架次序+1:{}", sequence);
			log.info("获取当前玻璃需要放的次序：笼内同流程同层数的通达次序+1:{}", sequence);
			DownGlassInfo downGlassInfo = downGlassInfoService.getOne(new LambdaQueryWrapper<DownGlassInfo>()
			.eq(DownGlassInfo::getFlowCardId, downGlassInfoDTO.getFlowCardId())
			.eq(DownGlassInfo::getLayer, downGlassInfoDTO.getLayer()).eq(DownGlassInfo::getSequence, sequence));