yy
5 天以前 afbdf224dcc6f4c5d0f9331e25b99e0621cb6afd
no message
1个文件已修改
12 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -768,7 +768,7 @@
                Task task = taskService.getById(segment.getTaskId());
                TaskPosDto.PosType posType = Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()));
                boolean isStation = posType.equals(TaskPosDto.PosType.ORI_STA) || posType.equals(TaskPosDto.PosType.DEST_STA);
                boolean isLoc = posType.equals(TaskPosDto.PosType.ORI_LOC) || posType.equals(TaskPosDto.PosType.DEST_LOC);
                // 节点条码
                Code code = codeService.getCacheById(segment.getEndNode());
@@ -792,7 +792,7 @@
                        boolean reverse = false;
                        if (nextDirection.equals((workDirection + 180) % 360)) {
                            List<String> list = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054", "00000080", "00000081", "00000082", "00000083", "00000084");
                            if (isStation && list.contains(lastCode.getData())) {
                            if ((isStation && list.contains("00000050")) || (isLoc && list.contains("00000080"))) {
                                reverse = false;
                                lastDirection = nextDirection;
                            } else {
@@ -819,7 +819,7 @@
                                    nextDirection = lastDirection;
                                    reverse = true;
                                } else {
                                    if (isStation && (lastCode.getData().equals("00000050") || lastCode.getData().equals("00000080"))) {
                                    if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                        // turn
                                        reverse = false;
                                        actionList.add(new Action(
@@ -846,7 +846,7 @@
                                    } else {
                                        List<String> list = Arrays.asList("00000051", "00000052", "00000053", "00000054");
                                        Double turnDirection = nextDirection;
                                        if (list.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) {
                                        if ((isStation && list.contains("00000050")) || (isLoc && list.contains("00000080"))) {
                                            turnDirection = 180.0;
                                        }
                                        // turn
@@ -875,7 +875,7 @@
                                    lastDirection = nextDirection;
                                }
                            } else {
                                if (isStation && (lastCode.getData().equals("00000050") || lastCode.getData().equals("00000080"))) {
                                if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
                                    // turn
                                    reverse = false;
                                    actionList.add(new Action(
@@ -963,7 +963,7 @@
                    if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                        Double turnDirection = workDirection;
                        List<String> list = Arrays.asList("00000050","00000051", "00000052", "00000053", "00000054", "00000080", "00000081", "00000082", "00000083", "00000084");
                        if (isStation && list.contains(lastCode.getData())) {
                        if ((isStation && list.contains("00000050")) || (isLoc && list.contains("00000080"))) {
                            turnDirection = workDirection + 180.0;
                        }
                        if (lastCode.getCornerBool()) {