1

skyouc

2026-01-05 5da24caea93040d9f6b95c9b88d80a0f951a93ad

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

@@ -799,7 +799,7 @@
                        // 第一步：如果下一个方向正好是作业方向的相反方向，则重置下一个方向为作业方向，标记 reverse = true
                        boolean reverse = false;
                        if (nextDirection.equals((workDirection + 180) % 360)) {
                            if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(lastCode.getData()))) {
                            if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                reverse = false;
                                lastDirection = nextDirection;
                            } else {
@@ -826,7 +826,7 @@
                                    nextDirection = lastDirection;
                                    reverse = true;
                                } else {
                                    if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                    if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                        // turn
                                        reverse = false;
                                        actionList.add(new Action(
@@ -854,6 +854,7 @@
                                        Double turnDirection = nextDirection;
                                        if (turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) {
                                            turnDirection = 180.0;
                                            reverse = false;
                                        }
                                        // turn
                                        actionList.add(new Action(
@@ -882,7 +883,7 @@
                                }
                            } else {
                                // if (isStation && lastCode.getData().equals("00000050")) {
                                if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                                    // turn
                                    reverse = false;
                                    actionList.add(new Action(
@@ -901,7 +902,6 @@
                                            now    // 工作时间
                                    ));

                                    reverse = false;
                                    log.info("3TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                            posType,
                                            lastCode.getData(),
@@ -971,8 +971,17 @@
                if (first) {
                    if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                        Double turnDirection = workDirection;
                        // if (isStation && turnCodes.contains(lastCode.getData())) {
                        if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(lastCode.getData()))) {
                        Code nextCode = null;
                        //添加判断是否存在下一个地码
                        int index = pathList.indexOf(lastCode.getData());
                        if (index != -1 && index + 1 < pathList.size()) {
                            String nextCodeData = pathList.get(index + 1);
                            nextCode = codeService.getCacheByData(nextCodeData);
                        } else {
                            nextCode = codeService.getCacheByData(lastCode.getData());
                        }

                        if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
                            turnDirection = workDirection + 180.0;
                        }
                        if (lastCode.getCornerBool()) {