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

Junjie

2025-05-23 1b007b8d43f82cf86e3cf5f2a316f30bae51deb2

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

@@ -1314,7 +1314,7 @@
                return false;
            }

            if (!shuttleProtocol.getCurrentLocNo().equals(wrkMast.getLocNo())) {
            if (!wrkMast.getLocNo().equals(shuttleProtocol.getCurrentLocNo())) {
                return false;
            }