#led task

zjj

2024-11-19 d47f3a55e5f7b4328ad1bd2e059f03e5c0c4151a

 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;
                    }
@@ -667,7 +670,7 @@
                                break;
                            }
                        }
                        if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
                        if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
                            break;
                        }
                        if (locMastGro1.getLocSts().equals("O")){