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

taisheng

2025-07-02 a5fd6b72f8342f0228321849b04c822feba2d2a0

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

@@ -44,8 +44,8 @@
    }

    @Override
    public List<WrkMast> selectNoShuttleWrkByLev(Integer lev) {
        return this.baseMapper.selectNoShuttleWrkByLev("%" + lev);
    public List<WrkMast> selectWrkByLev(Integer lev) {
        return this.baseMapper.selectWrkByLev("%" + lev);
    }

    @Override
@@ -85,8 +85,8 @@
                , WrkStsType.OUTBOUND_LIFT_RUN_COMPLETE.sts

                , WrkStsType.NEW_MOVE.sts
                , WrkStsType.MOVE_SITE.sts
                , WrkStsType.MOVE_SITE_COMPLETE.sts
                , WrkStsType.MOVE_NEARBY.sts
                , WrkStsType.MOVE_NEARBY_COMPLETE.sts
                , WrkStsType.MOVE_IN_LIFT.sts
                , WrkStsType.MOVE_IN_LIFT_COMPLETE.sts
                , WrkStsType.MOVE_LIFT_RUN.sts
@@ -122,7 +122,7 @@
    }

    @Override
    public WrkMast selectLiftWrkMast(Integer liftNo) {
    public List<WrkMast> selectLiftWrkMast(Integer liftNo) {
        return this.baseMapper.selectLiftWrkMast(liftNo);
    }
}