Merge remote-tracking branch 'origin/bfasrs' into bfasrs

whycq

2023-03-09 392aebed0af81c8369a3f07dfdc53cad1b59f6b4

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

@@ -157,6 +157,10 @@
        LocMast finalRes = null;
        for (String locNo : locNos) {
            LocMast locMast = this.selectById(locNo);
            if(locMast == null)
            {
                continue;
            }
            if (locMast.getLocSts().equals("O")) {
                if (finalRes == null) {
                    finalRes = locMast;