~zhoushihao/YiWuProject.git

			@@ -757,12 +757,17 @@
			if (isPair == 0 && isForce != 1) {
			taskType = Const.BIG_STORAGE_AFTER_DISPATCH;
			taskState = Const.GLASS_STATE_SCHEDULE_ING;
			resultList.add(list.get(0));
			//目前调度任务totalLayer为0 出片调度任务有层号，用于区分调度方式
			// 因为出片存在调度，如果为调度，提前占用格子，更新格子剩余尺寸，避免被进片玻璃占用
			if (totalLayer != 0) {
			resultList.add(list.get(0));
			HollowBigStorageCage storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
			.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1"));
			targetSlot = storageCage.getSlot();
			hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
			.set(HollowBigStorageCage::getRemainWidth, 0).eq(HollowBigStorageCage::getSlot, targetSlot));
			}else{
			resultList = tempList;
			}
			totalLayer = 0;
			} else {
			@@ -849,6 +854,9 @@
			//是否存在有格子非空的玻璃
			if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
			//存在将格子内的玻璃分别进行更新
			// List<HollowBigStorageCage> hollowBigStorageCageList = hollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>()
			// .lt(HollowBigStorageCage::getRemainWidth, 0).in(HollowBigStorageCage::getSlot, slotList));
			// List<Integer> resultSlotList = hollowBigStorageCageList.stream().map(HollowBigStorageCage::getSlot).collect(Collectors.toList());
			slotRemainMap = inSlotGlassList.stream()
			.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getSlot, Collectors.summingDouble(item -> Math.max(item.getWidth(), item.getHeight()) + glassGap)));
			slotRemainMap.forEach((e, v) -> {