#

luxiaotao1123

2025-12-29 9e7d103dcc2d95f72109ab5f02d3e942e9b7bbf9

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java

@@ -111,8 +111,8 @@
        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);

        // update reserve to be waiting state
        int changed = this.baseMapper.updateStateToWaiting(sta.getId()
                , task.getId()
        int changed = this.baseMapper.updateStateToWaiting(task.getId()
                , sta.getId()
                , type.toString()
                , StaReserveStateType.WAITING.toString()
                , WAITING_EXPIRE_TIME
@@ -131,7 +131,6 @@
        if (Cools.isEmpty(list)) {
            return false;
        }

        StaReserve reserve = list.get(0);

        StaReserveStateType stateType = StaReserveStateType.of(reserve.getState());
@@ -145,11 +144,15 @@
    }

    @Override
    public Boolean rollbackWaitingToReserved(Sta sta, Task currTask, StaReserveType staReserveType) {

        rollbackWaitingToReserved

        return null;
    public Boolean rollbackWaitingToReserved(Sta sta, Task task, StaReserveType type) {
        int changed = this.baseMapper.updateStateBackToWaiting(
                task.getId()
                , sta.getId()
                , type.toString()
                , StaReserveStateType.RESERVED.toString()
                , WAITING_EXPIRE_TIME
        );
        return changed > 0;
    }

    @Override