blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wangfei
2024-07-11 9dae9b219bc4eb9c776cc31f2d4d58dbeb190031 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java


@@ -75,7 +75,9 @@


            List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);




            LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();


            feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT);


            feedTaskWrapper


                    .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)


                    .isNotNull(BigStorageCageFeedTask::getTargetSlot);


            List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);




            Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()


@@ -89,6 +91,20 @@


                    iterator.remove();


                }


            }


            LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskNoTargetWrapper = new LambdaQueryWrapper<>();


            feedTaskNoTargetWrapper


                    .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)


                    .isNull(BigStorageCageFeedTask::getTargetSlot);


            List<BigStorageCageFeedTask> bigStorageCageFeedTaskNoTargetList = bigStorageCageFeedTaskMapper.selectList(feedTaskNoTargetWrapper);


            for (BigStorageCageFeedTask bigStorageCageFeedTask:bigStorageCageFeedTaskNoTargetList


                 ) {


                BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();


                LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();


                glassInfoWrapper.eq(GlassInfo::getGlassId,bigStorageCageFeedTask.getGlassId());


                GlassInfo glassInfo= glassInfoMapper.selectOne(glassInfoWrapper);


                BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);


                bigStorageCageDetailsList.add(bigStorageCageDetails);


            }


            return bigStorageCageDetailsList;


        } else {


            //出片任务数据