#

vincentlu

7 小时以前 6cbb420754e6e29fa134a6afca4514b8dfd62918

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

@@ -28,8 +28,8 @@
@Service("staReserveService")
public class StaReserveServiceImpl extends ServiceImpl<StaReserveMapper, StaReserve> implements StaReserveService {

    public static final Long RESERVE_EXPIRE_TIME = 30 * 60 * 1000L;
    public static final Long WAITING_EXPIRE_TIME = 5 * 60 * 1000L;
    public static final Long RESERVE_EXPIRE_TIME = 30 * 60L;
    public static final Long WAITING_EXPIRE_TIME = 5 * 60L;

    public static final Integer DEFAULT_QTY = 1;

@@ -211,8 +211,8 @@
    }

    @Override
    public void allocateCallBack(Sta sta, Task task, Long agvId) {
        if (Cools.isEmpty(sta, task, agvId)) {
    public void allocateCallBack(Task task, Long agvId) {
        if (Cools.isEmpty(task, agvId)) {
            return;
        }
        TaskTypeType taskType = TaskTypeType.get(task.getTaskTypeEl());
@@ -226,36 +226,48 @@
            case LOC_TO_STA:
                inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getStaId, task.getDestSta())
                                .eq(StaReserve::getType, StaReserveType.IN.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
                                .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                if (null == inStaReserve) {
                    throw new CoolException("failed to find out sta reserve");
                }
                break;
            case STA_TO_LOC:
                outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getStaId, task.getOriSta())
                                .eq(StaReserve::getType, StaReserveType.OUT.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
                                .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                if (null == outStaReserve) {
                    throw new CoolException("failed to find out sta reserve");
                }
                break;
            case STA_TO_STA:
                inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getStaId, task.getDestSta())
                                .eq(StaReserve::getType, StaReserveType.IN.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
                                .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getStaId, task.getOriSta())
                                .eq(StaReserve::getType, StaReserveType.OUT.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
                                .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                if (null == inStaReserve) {
                    throw new CoolException("failed to find out sta reserve");
                }
                if (null == outStaReserve) {
                    throw new CoolException("failed to find out sta reserve");
                }
                break;
            default:
                return;
@@ -264,14 +276,14 @@
            inStaReserve.setAgvId(agvId);
            inStaReserve.setUpdateTime(now);
            if (!this.updateById(inStaReserve)) {
                throw new CoolException("Sta[" + sta.getStaNo() + "] reserve failed");
                throw new CoolException("failed to update sta reserve");
            }
        }
        if (null != outStaReserve) {
            outStaReserve.setAgvId(agvId);
            outStaReserve.setUpdateTime(now);
            if (!this.updateById(outStaReserve)) {
                throw new CoolException("Sta[" + sta.getStaNo() + "] reserve failed");
                throw new CoolException("failed to update sta reserve");
            }
        }
    }