#

luxiaotao1123

2025-12-29 62606f9cc72b1aff1e65f9f0169f97edfecf643f

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

@@ -100,6 +100,8 @@
    private ActionSorter actionSorter;
    @Autowired
    private StaReserveService staReserveService;
    @Autowired
    private ConveyorStationService conveyorStationService;

    @SuppressWarnings("all")
    @Transactional
@@ -1464,19 +1466,79 @@
        // 取放货请求包
        if (msgBody instanceof AGV_06_UP) {
            AGV_06_UP agv_06_up = (AGV_06_UP) msgBody;

            log.info("Agv [{}] 取放货请求包 ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_06_up));

            // query current segment
            Segment currSeg = segmentService.getCurrRunningSeg(agv.getId(), agv_06_up.getQrCode());
            boolean success = false;

            try {
                Code code = codeService.getCacheByData(agv_06_up.getQrCode());

            // todo:vincent 校验是否可以取放货
                // query current segment
                Segment currSeg = segmentService.getCurrRunningSeg(agv.getId(), code.getId());
                if (null == currSeg) {
                    log.error("failed to find curr segment [{}]", agv.getUuid());
                } else {

                    // query current task
                    Task currTask = taskService.getById(currSeg.getTaskId());
                    if (currTask == null || !currTask.getTaskSts().equals(TaskStsType.PROGRESS.val())) {

                        log.error("agv[{}] task invalid, task={}", protocol.getAgvNo(), currSeg.getTaskId());
                    } else {

                        Sta sta;
                        TaskPosDto.PosType posType = TaskPosDto.PosType.of(currSeg.getPosType());
                        assert null != posType;
                        switch (posType) {
                            case ORI_LOC:
                            case DEST_LOC:
                                success = true;
                                break;
                            case ORI_STA:
                                // load from sta
                                sta = staService.getById(currTask.getOriSta());
                                // reserve to be waiting
                                if (!staReserveService.waitingStaReserve(sta, currTask, 1, StaReserveType.OUT)) {
                                    break;
                                }
                                // convey plc valid
                                if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
                                    // reserve rollback
                                    staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
                                    break;
                                }
                                success = true;
                                break;
                            case DEST_STA:
                                // place to sta
                                sta = staService.getById(currTask.getDestSta());
                                // reserve to be waiting
                                if (!staReserveService.waitingStaReserve(sta, currTask, 1, StaReserveType.IN)) {
                                    break;
                                }
                                // convey plc valid
                                if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
                                    // reserve rollback
                                    staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
                                    break;
                                }
                                success = true;
                                break;
                            default:
                                log.error("agv[{}] has wrong posType [{}], segment [{}]", protocol.getAgvNo(), posType.toString(), currSeg.getId());
                                break;
                        }
                    }
                }

            } catch (Exception e) {
                log.error("agv[{}] failed to deal with action request, qrCode={}", agv.getUuid(), agv_06_up.getVal(), e);
            }

            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(1);
            agv_06_down.setResult(success ? 1 : 0);

            redis.push(RedisConstant.AGV_PATH_DOWN_FLAG, AgvProtocol.build(protocol.getAgvNo()).setMessageBody(agv_06_down));
        }
@@ -1528,8 +1590,6 @@
            }

            if (taskComplete) {
//                locService.taskCallBack(task);

                task.setTaskSts(TaskStsType.COMPLETE.val());
                task.setEndTime(now);
                task.setUpdateTime(now);