#

Junjie

2023-12-04 d5e867f72e7f225e1f1f5db2f2d91ab15019e4a3

 src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java

@@ -102,7 +102,9 @@

            List<String> list = this.selectCacheShelvesStationCodeByFloor(3);
            if(list.contains(stationCode)){
                wrapper.orderBy("dev_no",false);
                if(Cools.eq(stationCode,"CS-305") || Cools.eq(stationCode,"CS-306") || Cools.eq(stationCode,"CS-307")){
                    wrapper.orderBy("dev_no",false);
                }
            }

            List<AgvBasDevp> agvBasDevpList = this.selectList(wrapper);
@@ -118,10 +120,21 @@
                    return agvBasDevpDto;
                }

                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                        .eq("loc_no", agvBasDevpDto.getDevNo())
                        .or().eq("source_loc_no",agvBasDevpDto.getDevNo()));

                AgvWrkMast agvWrkMast = null;
                for (AgvWrkMast wrkMast : agvWrkMasts){
                    if(Cools.isEmpty(agvWrkMast)){
                        agvWrkMast = wrkMast;
                    }else {
                        if(agvWrkMast.getWrkSts() < wrkMast.getWrkSts()){
                            agvWrkMast = wrkMast;
                        }
                    }
                }

                agvBasDevpDto.setAgvWrkMast(agvWrkMast);

                if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){