#
vincentlu
54 分钟以前 6cbb420754e6e29fa134a6afca4514b8dfd62918
#
1个文件已修改
23 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -1101,6 +1101,25 @@
                // 初始方向值补丁
                if (first) {
                    if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                        Double firstTurnDir = workDirection;
                        // 巷道逻辑
                        if (!laneBuilder.isInitialized()) {
                            throw new CoolException("lanes are not initialized");
                        }
                        LaneDto lastLaneDto = laneBuilder.search(lastCode.getData());
                        // 进入巷道角度
                        Double lastLaneDir = laneService.getLaneDirection(lastLaneDto);
                        if (lastLaneDir != null) {
                            firstTurnDir = lastLaneDir;
                        }
                        if (!lastDirection.equals(firstTurnDir)) {
                            if (!lastCode.getCornerBool()) {
                                throw new CoolException(agvNo + "号小车方向错误,请推至转弯点手动调整");
                            }
                        }
                        // turn
                        actionList.add(new Action(
                                null,    // 编号
@@ -1111,14 +1130,14 @@
                                ActionTypeType.TurnCorner.desc,    // 名称
                                (double) mapService.spinDirection(lastCode).val,    // 属性值
                                lastCode.getData(),    // 地面码
                                String.valueOf(workDirection),   // 动作参数
                                String.valueOf(firstTurnDir),   // 动作参数
                                ActionTypeType.TurnCorner.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                        ));
                        lastDirection = workDirection;
                        lastDirection = firstTurnDir;
                    }
                    first = false;