YiWuProject.git

			@@ -90,8 +90,6 @@
			@Value("${mes.outCarMaxSize}")
			private Integer outCarMaxSize;

			@Value("${mes.sequence.order}")
			private boolean sequenceOrder;
			@Value("${mes.temperingOutTargetPosition}")
			private Integer temperingOutTargetPosition;
			@Value("${mes.artificialOutTargetPosition}")
			@@ -225,7 +223,8 @@
			//是否允许钢化
			//是否有正在钢化的玻璃:钢化小片表关联历史任务表，筛选未出笼的玻璃信息
			// 获取当前钢化任务未完成出片的玻璃信息
			List<TemperingGlassInfo> unFinishTemperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>().eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW));
			List<TemperingGlassInfo> unFinishTemperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW).orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
			if (CollectionUtil.isNotEmpty(unFinishTemperingGlassInfoList)) {
			// List<String> glassIdList = unFinishTemperingGlassInfoList.stream().map(TemperingGlassInfo::getGlassId).collect(Collectors.toList());
			// List<BigStorageCageHistoryTask> historyTaskList = bigStorageCageHistoryTaskService.list(new LambdaQueryWrapper<BigStorageCageHistoryTask>()
			@@ -260,7 +259,7 @@
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId())
			.eq(GlassInfo::getEngineerId, item.getEngineerId())
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			.orderByAsc(GlassInfo::getTemperingFeedSequence));
			if (CollectionUtil.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			computeOutGlassInfoByVirtualSlot(temperingGlassInfos, "big_storage_cage_out_one_task", temperingOutTargetPosition, Const.GLASS_STATE_OUT_ING, Const.BIG_STORAGE_BEFORE_OUT);
			@@ -299,21 +298,22 @@
			continue;
			}
			int sequence = -1;
			int startSlot = -1;
			int targetSlot = -1;
			for (BigStorageSequenceDTO item : sequenceDTOList) {
			if (item.getMinSequence() == sequence + 1) {
			if (item.getMaxSequence() == sequence - 1) {
			//生成调度任务
			int targetSlot = item.getSlot();
			int startSlot = item.getSlot();
			list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).eq(BigStorageCageDetails::getSlot, startSlot));
			computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task", targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
			targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			List<Integer> slotList = new ArrayList<>();
			slotList.add(targetSlot);
			updateSlotRemainBySlots(slotList);
			break loop;
			}
			sequence = item.getMaxSequence();
			startSlot = item.getSlot();
			sequence = item.getMinSequence();
			targetSlot = item.getSlot();
			}
			}
			}
			@@ -644,7 +644,7 @@
			log.info("将出片玻璃{}玻璃状态改为出片中", glassIds);
			bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
			.set(BigStorageCageDetails::getState, state)
			.set(Const.RAW_GLASS_TASK_TYPE_DISPATCH.equals(taskType), BigStorageCageBaseInfo::getSlot, targetSlot)
			.set(Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType), BigStorageCageBaseInfo::getSlot, targetSlot)
			.ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
			.in(BigStorageCageDetails::getGlassId, glassIds));
			try {