YiWuProject.git

			@@ -188,7 +188,11 @@
			public List<DownStorageCageDetails> CacheOut1(int start, int end) {


			List<DownStorageCageDetails> cageDetails = downStorageCageDetailsMapper.selectList(null);
			// 创建一个 LambdaQueryWrapper 实例
			LambdaQueryWrapper<DownStorageCageDetails> lambdaQueryWrapper = new LambdaQueryWrapper<>();
			// 条件 state=100
			lambdaQueryWrapper.eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN);
			List<DownStorageCageDetails> cageDetails = downStorageCageDetailsMapper.selectList(lambdaQueryWrapper);
			// Step 5: 判断 down_storage_cage_details 结果数量是否为9，如果是，则执行另外一个查询
			if (cageDetails.size() == 9) {
			log.info("1、笼子满了的时候，按照笼内版图id 版图片序出");

			@@ -203,8 +203,8 @@
			private Boolean outTo(String MESSendingWord) {
			log.info("单片情况根据传入的料架号查询符合按照版图id和片序出片,并且优先出满架的小片");

			List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
			List<DownStorageCageDetails> list4to6 = downStorageCageDetailsService.CacheOut1(4, 6);
			// List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
			// List<DownStorageCageDetails> list4to6 = downStorageCageDetailsService.CacheOut1(4, 6);
			List<DownStorageCageDetails> list1to6 = downStorageCageDetailsService.CacheOut1(1, 6);

			DownStorageCageDetails selectedItem = null;
			@@ -217,24 +217,24 @@
			if (item3.getHeight() >= 2500 && item3.getWidth() >= 2660) {
			log.info("人工处理");
			selectedItem = item3;
			endCell = "7";
			} else if (!list4to6.isEmpty() && !list1to6.isEmpty()) {

			} else if (!!list1to6.isEmpty()) {
			log.info("前后端都空闲优先后端出片并且优先满架");
			selectedItem = list4to6.get(0);
			selectedItem = list1to6.get(0);
			}
			}

			// 按照版图id和片序符合前端出片
			if (selectedItem == null && !list1to3.isEmpty()) {
			log.info("前端出片");
			selectedItem = list1to3.get(0);
			}

			// 按照版图id和片序符合后端出片
			if (selectedItem == null && !list4to6.isEmpty()) {
			log.info("后端出片");
			selectedItem = list4to6.get(0);
			}
			// if (selectedItem == null && !list1to3.isEmpty()) {
			// log.info("前端出片");
			// selectedItem = list1to3.get(0);
			// }
			//
			// // 按照版图id和片序符合后端出片
			// if (selectedItem == null && !list4to6.isEmpty()) {
			// log.info("后端出片");
			// selectedItem = list4to6.get(0);
			// }

			if (selectedItem != null) {
			DownWorkstation downWorkstation = downWorkstationService.getOne(
			@@ -286,11 +286,11 @@
			DownWorkstation downWorkstation1 = downWorkstationService.selectByFlowCardId(downGlassInfo.getFlowCardId());
			downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksnumber() + 1);
			log.info("更新落架数量");
			LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(DownGlassTask::getGlassId, newdownGlassInfo.getGlassId());
			DownGlassTask updateDetail = new DownGlassTask();
			updateDetail.setTaskStauts(2);
			downGlassTaskService.update(updateDetail, wrapper);
			// LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
			// wrapper.eq(DownGlassTask::getGlassId, newdownGlassInfo.getGlassId());
			// DownGlassTask updateDetail = new DownGlassTask();
			// updateDetail.setTaskStauts(2);
			// downGlassTaskService.update(updateDetail, wrapper);
			sequence++; // 递增顺序字段值

	hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史