| | |
|---|
| | | //获取笼内所有玻璃信息，包括待进片的 |
|---|
| | | List<EdgStorageCageDetails> glassList = queryEdgAllGlass(glassId); |
|---|
| | | Assert.isTrue(CollectionUtil.isNotEmpty(glassList), "笼内和待进片都没有玻璃"); |
|---|
| | | int othercell = endcell == Const.A10_OUT_TARGET_POSITION ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION; |
|---|
| | | glassInfo = queryChangeGlassInfo(othercell, glassId); |
|---|
| | | if (glassList.size() == 1 && glassId.equals(glassList.get(0).getGlassId())) { |
|---|
| | | glassInfo = glassList.get(0); |
|---|
| | | } else { |
|---|
| | | int othercell = endcell == Const.A10_OUT_TARGET_POSITION ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION; |
|---|
| | | glassInfo = queryChangeGlassInfo(othercell, glassId); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | private List<EdgStorageCageDetails> queryEdgAllGlass(String glassId) { |
|---|
| | | List<EdgStorageCageDetails> glassList = new ArrayList<>(); |
|---|
| | | //获取待进片玻璃 |
|---|
| | | if(StringUtils.isNotBlank(glassId)){ |
|---|
| | | if (StringUtils.isNotBlank(glassId)) { |
|---|
| | | GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>() |
|---|
| | | .eq(GlassInfo::getGlassId, glassId)); |
|---|
| | | EdgStorageCageDetails resultDetails = new EdgStorageCageDetails(); |
|---|
| | |
|---|
| | | .groupBy(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight) |
|---|
| | | .last("order by count(t.glass_id) desc limit 2"); |
|---|
| | | List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper); |
|---|
| | | if (CollectionUtil.isEmpty(list)){ |
|---|
| | | if (CollectionUtil.isEmpty(list)) { |
|---|
| | | return null; |
|---|
| | | } |
|---|
| | | log.info("获取笼子内数量前二的玻璃数量：{}", list); |
|---|
