#

luxiaotao1123

4 天以前 ff952db837b9193a58ddf42396d8aff34d5b34ff

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

@@ -21,8 +21,9 @@
import com.zy.acs.manager.common.domain.param.HandlerPublishParam;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.domain.AgvBackpackDto;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.core.domain.LaneDto;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.integrate.conveyor.ConveyorStationService;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
@@ -93,7 +94,7 @@
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private LaneService laneService;
    private LaneBuilder laneBuilder;
    @Autowired
    private ActionSorter actionSorter;
    @Autowired
@@ -447,7 +448,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 +462,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());
@@ -669,6 +670,7 @@


            // generate travel
            travelService.finishAll(agvId);
            Travel travel = new Travel();
            travel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            travel.setTravelId(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
@@ -790,9 +792,9 @@
            task.setOriCode(agvDetail.getCode());
            task.setDestCode(endCode.getId());
            // lane
            Lane destLane = laneService.search(endCode.getData());
            if (null != destLane) {
                task.setDestLaneHash(destLane.getHashCode());
            LaneDto destLaneDto = laneBuilder.search(endCode.getData());
            if (null != destLaneDto) {
                task.setDestLaneHash(destLaneDto.getHashCode());
            }
            task.setPriority(taskType.equals(TaskTypeType.TO_CHARGE)?2:1);
            task.setTaskSts(TaskStsType.ASSIGN.val());
@@ -804,6 +806,7 @@
            }

            // generate travel
            travelService.finishAll(agvId);
            Travel travel = new Travel();
            travel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            travel.setTravelId(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
@@ -1813,8 +1816,8 @@
            AGV_06_DOWN agv_06_down = new AGV_06_DOWN();
            agv_06_down.setSerialNo(agv_06_up.getSerialNo());
            agv_06_down.setActionCode(agv_06_up.getActionCode());
            agv_06_down.setResult(success ? 1 : 0);

            //agv_06_down.setResult(success ? 1 : 0);
            agv_06_down.setResult(1);
            redis.push(RedisConstant.AGV_PATH_DOWN_FLAG, AgvProtocol.build(protocol.getAgvNo()).setMessageBody(agv_06_down));
        }