~zhoushihao/YiWuProject.git

			@@ -798,7 +798,7 @@
			}
			Assert.isFalse(CollectionUtil.isEmpty(templist), "未获取出片数据，结束出片任务");
			log.info("获取出片任务数据{}条，执行保存", templist.size());
			List<T> baseInfoList = new ArrayList<>();
			List<T> baseInfoList = templist;
			if (1 != isForce) {
			if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
			//校验防止小于等于总层数玻璃片序不匹配的问题，该问题多出现在大片玻璃，3层
			@@ -816,21 +816,10 @@
			} else {
			//大于总层数先取totalLyaer倍数数量的玻璃，保证大车上的玻璃成对传
			int remainCount = templist.size() % totalLayer;
			if (targetSlot == 931) {
			baseInfoList = templist.subList(0, templist.size() - remainCount);
			if (targetSlot == 930) {
			baseInfoList = templist.subList(0, totalLayer);
			} else {
			//930时玻璃顺序倒序、同一对玻璃倒序
			baseInfoList = templist.subList(0, templist.size() - remainCount);
			Map<Integer, List<T>> listMap = baseInfoList.stream().collect(Collectors.groupingBy(T::getHollowSequence));
			Map<Integer, List<T>> sortListMap = new TreeMap<>(Collections.reverseOrder());
			sortListMap.putAll(listMap);
			List<T> resultList = new ArrayList<>();
			for (Map.Entry<Integer, List<T>> e : sortListMap.entrySet()) {
			for (T t : e.getValue()) {
			resultList.add(t);
			}
			}
			baseInfoList = resultList;
			}
			}
			}
			@@ -842,13 +831,13 @@
			for (T t : baseInfoList) {
			bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
			}
			while (baseInfoList.size() < 6) {
			while (bigStorageCageTaskList.size() < 6) {
			bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
			}
			//清空任务表数据
			bigStorageCageTaskService.removeAll(tableName);
			bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
			List<HollowBigStorageCageHistoryTask> historyList = baseInfoList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
			List<HollowBigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
			HollowBigStorageCageHistoryTask history = new HollowBigStorageCageHistoryTask();
			BeanUtils.copyProperties(e, history);
			history.setGlassCount(glassCount);