zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
@@ -289,7 +289,7 @@ if (null == staReserveService.reserveStaIn(destSta, task, 1)) { throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败"); } staReserveService.allocateCallBack(destSta, task, agv.getId()); staReserveService.allocateCallBack(task, agv.getId()); // task task.setOriLoc(oriLoc.getId()); @@ -311,7 +311,7 @@ if (null == staReserveService.reserveStaOut(oriSta, task, 1)) { throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败"); } staReserveService.allocateCallBack(oriSta, task, agv.getId()); staReserveService.allocateCallBack(task, agv.getId()); // destLoc if (!Cools.isEmpty(param.getEndLocNo())) { @@ -352,7 +352,7 @@ if (null == staReserveService.reserveStaOut(oriSta, task, 1)) { throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败"); } staReserveService.allocateCallBack(oriSta, task, agv.getId()); staReserveService.allocateCallBack(task, agv.getId()); // destSta if (!Cools.isEmpty(param.getEndStaNo())) { @@ -367,7 +367,7 @@ if (null == staReserveService.reserveStaIn(destSta, task, 1)) { throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败"); } staReserveService.allocateCallBack(destSta, task, agv.getId()); staReserveService.allocateCallBack(task, agv.getId()); // task task.setOriSta(oriSta.getId()); zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -447,7 +447,7 @@ throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update"); } // update reserve staReserveService.allocateCallBack(sta, task, agvId); staReserveService.allocateCallBack(task, agvId); } // normal , (task, agvNo, sta) -> { @@ -461,7 +461,7 @@ throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update"); } // update reserve staReserveService.allocateCallBack(sta, task, agvId); staReserveService.allocateCallBack(task, agvId); }); // if (Cools.isEmpty(agvNo)) { //// log.warn("Task[{}] has an issue， because it failed to check out agv which is idle...", task.getSeqNum()); zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java
@@ -23,6 +23,6 @@ void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type); void allocateCallBack(Sta sta, Task task, Long agvId); void allocateCallBack(Task task, Long agvId); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -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,7 +226,7 @@ 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::getState, StaReserveStateType.RESERVED.toString()) // .gt(StaReserve::getExpireTime, now) @@ -238,7 +238,7 @@ 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::getState, StaReserveStateType.RESERVED.toString()) // .gt(StaReserve::getExpireTime, now) @@ -250,14 +250,14 @@ 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::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::getState, StaReserveStateType.RESERVED.toString()) // .gt(StaReserve::getExpireTime, now) @@ -276,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"); } } }
