义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-12-10 b94ae4d8f439b78a419da97d12e863d41ac4c181 
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java


@@ -64,8 +64,7 @@


                .eq(HollowGlassRelationInfo::getWidth, width)


                .eq(HollowGlassRelationInfo::getHeight, height)


                .eq(HollowGlassRelationInfo::getLayer, layer)


                .isNull(HollowGlassRelationInfo::getTemperingLayoutId)


                .isNull(HollowGlassRelationInfo::getTemperingFeedSequence)


                .eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW)


                .orderByAsc(HollowGlassRelationInfo::getHollowSequence)


                .last("limit 1")


        );


@@ -78,14 +77,16 @@


                    .eq(HollowGlassRelationInfo::getWidth, width)


                    .eq(HollowGlassRelationInfo::getHeight, height)


                    .eq(HollowGlassRelationInfo::getLayer, layer)


                    .isNull(HollowGlassRelationInfo::getTemperingLayoutId)


                    .isNull(HollowGlassRelationInfo::getTemperingFeedSequence)


                    .eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW)


                    .orderByAsc(HollowGlassRelationInfo::getHollowSequence)


                    .last("limit 1")


            );


        }


        HollowBigStorageCageDetails hollowDetails = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()


                .eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot()).in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)


                .eq(HollowBigStorageCageDetails::getFlowCardId, relationInfoOne.getFlowCardId())


                .eq(HollowBigStorageCageDetails::getLayer, layer)


                .eq(HollowBigStorageCageDetails::getVirtualSlot, relationInfoOne.getVirtualSlot())


                .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)


                .orderByDesc(HollowBigStorageCageDetails::getSequence).last("limit 1"));


        HollowBigStorageCage storageCage = null;


        if (null == hollowDetails) {


@@ -200,6 +201,7 @@


                    hollow.setVirtualSlot(temp.get(0).getVirtualSlot());


                    hollow.setFilmsId(glassInfo.getFilmsid());


                    hollow.setThickness(glassInfo.getThickness());


                    hollow.setState(Const.HOLLOW_RELATION_NEW);


                    temp.add(hollow);


                    flag = true;


                    break;


@@ -214,6 +216,7 @@


                hollow.setVirtualSlot(slotNumber++);


                hollow.setFilmsId(glassInfo.getFilmsid());


                hollow.setThickness(glassInfo.getThickness());


                hollow.setState(Const.HOLLOW_RELATION_NEW);


                newList.add(hollow);


                tempHollowList.add(newList);


            }


@@ -242,9 +245,16 @@


        return dtos.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));


    }




//    @Override


//    public Map<Integer, List<LackDetailsDTO>>  queryLackByFlowCard(String flowCardId) {


//        List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);


//        Map<Integer, List<LackDetailsDTO>> listMap = lackDetailsList.stream().collect(Collectors.groupingBy(LackDetailsDTO::getLayer));


//        return listMap;


//    }


    @Override


    public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId, int layer) {


        return this.baseMapper.queryLackByFlowCard(flowCardId, layer);


    public List<LackDetailsDTO>  queryLackByFlowCard(String flowCardId) {


        List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);


        return lackDetailsList;


    }




}