严智鑫
2024-05-10 211cd083bc9fc1871779802650dfe0e607d8ca77
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -143,7 +143,7 @@
                .eq(EdgStorageCageDetails::getGlassId,glassId)
        );
        List<EdgStorageCageDetails> listEdgStorageCageDetails= baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
                .lt(EdgStorageCageDetails::getState,200)
                .eq(EdgStorageCageDetails::getState,100)
                .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
        );
        EdgStorageCageDetails minTemperingLayoutId=new EdgStorageCageDetails();
@@ -151,8 +151,9 @@
            minTemperingLayoutId=listEdgStorageCageDetails.get(0);
        }
        EdgStorageCageDetails result=new EdgStorageCageDetails();
        boolean a=minTemperingLayoutId!=null;
        if(edgStorageCageDetails!=null&&minTemperingLayoutId!=null){
            result=edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
            List <EdgStorageCageDetails> list= edgStorageCageMapper.selectJoinList(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
                    .selectAll(EdgStorageCageDetails.class)
                    .leftJoin(EdgStorageCageDetails.class,on->on
                            .eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
@@ -164,6 +165,9 @@
                    .le(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId()+poor)
                    .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
            );
            if(!list.isEmpty()){
                result=list.get(0);
            }
        }
        if (result==null){