| | |
|---|
| | | computeOutGlassInfoByVirtualSlot(List<T> list, String tableName, int targetSlot, int state, int taskType) { |
|---|
| | | //任务数据:获取车子存放玻璃最大数量,玻璃间隔 |
|---|
| | | List<T> outGlassList = list; |
|---|
| | | // if (!THROUGH_SLOT.equals(list.get(0).getSlot())) { |
|---|
| | | // 临时解决方案:出片时考虑玻璃碰撞，改为一片一出 |
|---|
| | | // 界面关闭调度开关 !Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType) |
|---|
| | | if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 8) { |
|---|
| | | outGlassList = list.subList(0, 1); |
|---|
| | | } else { |
|---|
| | | List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId( |
|---|
| | | list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence()); |
|---|
| | | if (CollectionUtil.isEmpty(glassIdList)) { |
|---|
| | | outGlassList = list.subList(0, 1); |
|---|
| | | } else { |
|---|
| | | outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | // } |
|---|
| | | Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "未获取出片数据，结束出片任务"); |
|---|
