src/main/java/com/zy/common/service/CommonService.java
@@ -567,10 +567,13 @@ 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; }