#

vincentlu

8 天以前 1428a3da49f299abff59023f516deb7efa0bbdc4

#

 zy-acs-flow/src/i18n/en.js

@@ -292,8 +292,8 @@
                staSts: "station status",
                capacity: "capacity",
                occCnt: 'occupancy qty',
                rsvInCnt: 'reserve release qty',
                rsvOutCnt: 'reserved pickup qty',
                rsvInCnt: 'reserve in qty',
                rsvOutCnt: 'reserved out qty',
            },
            codeGap: {
                code0: "code 1",

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -446,10 +446,13 @@
                            if (!taskService.updateById(task)) {
                                throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update");
                            }
                            // update reserve
                            staReserveService.allocateCallBack(sta, task, agvId);
                        }
                        // normal
                        , (task, agvNo, sta) -> {
                            Long agvId = agvService.getAgvId(agvNo);
                            // update task
                            task.setAgvId(agvId);
                            task.setTaskSts(TaskStsType.WAITING.val());
                            task.setIoTime(now);
@@ -457,6 +460,8 @@
                            if (!taskService.updateById(task)) {
                                throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update");
                            }
                            // update reserve
                            staReserveService.allocateCallBack(sta, 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/enums/TaskTypeType.java

@@ -1,5 +1,6 @@
package com.zy.acs.manager.manager.enums;

import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.entity.TaskType;
@@ -36,6 +37,9 @@
    }

    public static TaskTypeType get(String el) {
        if (Cools.isEmpty(el)) {
            return null;
        }
        for (TaskTypeType value : TaskTypeType.values()) {
            if (el.equals(value.toString())) {
                return value;

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java

@@ -22,4 +22,7 @@

    void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type);


    void allocateCallBack(Sta sta, Task task, Long agvId);

}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
@@ -10,6 +11,7 @@
import com.zy.acs.manager.manager.enums.StaReserveStateType;
import com.zy.acs.manager.manager.enums.StaReserveType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.mapper.StaMapper;
import com.zy.acs.manager.manager.mapper.StaReserveMapper;
import com.zy.acs.manager.manager.service.StaReserveService;
@@ -208,6 +210,72 @@
        }
    }

    @Override
    public void allocateCallBack(Sta sta, Task task, Long agvId) {
        if (Cools.isEmpty(sta, task, agvId)) {
            return;
        }
        TaskTypeType taskType = TaskTypeType.get(task.getTaskTypeEl());
        if (null == taskType) {
            return;
        }
        Date now = new Date();
        StaReserve inStaReserve = null;
        StaReserve outStaReserve = null;
        switch (taskType) {
            case LOC_TO_STA:
                inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getType, StaReserveType.IN.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                break;
            case STA_TO_LOC:
                outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getType, StaReserveType.OUT.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                break;
            case STA_TO_STA:
                inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
                                .eq(StaReserve::getTaskId, task.getId())
                                .eq(StaReserve::getStaId, sta.getId())
                                .eq(StaReserve::getType, StaReserveType.IN.toString())
                                .eq(StaReserve::getStatus, 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::getType, StaReserveType.OUT.toString())
                                .eq(StaReserve::getStatus, StaReserveStateType.RESERVED.toString())
//                        .gt(StaReserve::getExpireTime, now)
                );
                break;
            default:
                return;
        }
        if (null != inStaReserve) {
            inStaReserve.setAgvId(agvId);
            inStaReserve.setUpdateTime(now);
            if (!this.updateById(inStaReserve)) {
                throw new CoolException("Sta[" + sta.getStaNo() + "] reserve failed");
            }
        }
        if (null != outStaReserve) {
            outStaReserve.setAgvId(agvId);
            outStaReserve.setUpdateTime(now);
            if (!this.updateById(outStaReserve)) {
                throw new CoolException("Sta[" + sta.getStaNo() + "] reserve failed");
            }
        }
    }


    private String generateReserveUniqKey(Long staId, Long taskId, StaReserveType type) {
        return "STA:" + staId + "-TASK:" + taskId + "-T:" + type.toString();