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

zhangc

6 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

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

@@ -5,6 +5,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
import com.zy.acs.manager.manager.entity.Task;
@@ -28,8 +29,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;

@@ -109,11 +110,13 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean waitingStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
    public Boolean waitingStaReserve(Sta sta, Task task, Segment seg, Integer qty, StaReserveType type) {
        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);

        // update reserve to be waiting state
        int changed = this.baseMapper.updateStateToWaiting(task.getId()
        int changed = this.baseMapper.updateStateToWaiting(
                task.getId()
                , seg.getId()
                , sta.getId()
                , type.toString()
                , StaReserveStateType.WAITING.toString()
@@ -211,8 +214,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 +229,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 +241,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 +253,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 +279,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");
            }
        }
    }