自动化立体仓库 - WMS系统
pang.jiabao
2024-11-10 b42da56f5b8fa7a2c7b78485142ed96ac4ea3571
src/main/java/com/zy/common/service/CommonService.java
@@ -548,29 +548,32 @@
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("crn_no", 7)
                            .eq("lev1",locTypeDto.getLocType1())
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1", true));
                }else if (locMastWrk.getBay1() >=4 && locMastWrk.getBay1()<=12){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("crn_no", 7)
                            .eq("lev1",locTypeDto.getLocType1())
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1", false));
                }else {
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("crn_no", 7)
                            .eq("lev1",locTypeDto.getLocType1())
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1", true));
                }
                if (Cools.isEmpty(locMasts)) {
                    continue;
                }
                for (LocMast locMastGro1 : locMasts) {
                    if (locMastGro1.getBay1() == 2){
                        continue;
                    }
                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
                        break;
                    }
                    if (locMastGro1.getLocSts().equals("O") || locMastGro1.getLocSts().equals("S")){
                    if (locMastGro1.getLocSts().equals("O")){
                        locMast = locMastGro1;
                        break;
                    }